Merge lp:~salgado/launchpad/use-default-python into lp:launchpad

[Guilherme Salgado]

Change our scripts and Makefiles to use the default system python instead of a hard-coded version.

This makes it possible for us to build/run LP on either Hardy or Lucid with no changes and no need to have the python2.5 version of our dependencies installed.

I'm also being optimistic here and changing the revno of pygettextpo we use, assuming the needed changes[1] there will be approved.

[1] https://code.edge.launchpad.net/~salgado/pygettextpo/use-default-system-python/+merge/24360

[Jelmer Vernooij (jelmer)]

Thanks! Large but straightforward.

Is there a list of supported python versions somewhere, either in documentation or should there perhaps be one in the code?

review: Approve (code*)

[Guilherme Salgado (salgado)]

Thanks for the review, Jelmer.

Currently we support 2.5 and 2.6, but this will be the case only until
all production systems have been upgraded to Lucid. At that point we'll
stop supporting 2.5 and may even revert most of the changes on this
branch to force 2.6 to be used, always.

The changes on this branch are only needed because we need to be able to
(per IS requirements, in order for the Lucid upgrade to happen) run on
either 2.5 or 2.6 with no code changes.

[Michael Nelson (michael.nelson)]

review: Approve (code)

=== modified file 'Makefile'
--- Makefile	2010-05-27 01:28:33 +0000
+++ Makefile	2010-06-08 15:45:42 +0000
@@ -1,8 +1,7 @@
 # This file modified from Zope3/Makefile
 # Licensed under the ZPL, (c) Zope Corporation and contributors.
 
-PYTHON_VERSION=2.5
-PYTHON=python${PYTHON_VERSION}
+PYTHON=python
 WD:=$(shell pwd)
 PY=$(WD)/bin/py
 PYTHONPATH:=$(WD)/lib:$(WD)/lib/mailman:${PYTHONPATH}
@@ -215,7 +214,7 @@
 
 compile: $(PY) $(BZR_VERSION_INFO)
 	${SHHH} $(MAKE) -C sourcecode build PYTHON=${PYTHON} \
-	    PYTHON_VERSION=${PYTHON_VERSION} LPCONFIG=${LPCONFIG}
+	    LPCONFIG=${LPCONFIG}
 	${SHHH} LPCONFIG=${LPCONFIG} ${PY} -t buildmailman.py
 
 test_build: build

=== modified file 'buildmailman.py'
--- buildmailman.py	2010-04-22 17:30:35 +0000
+++ buildmailman.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.5
+#! /usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/allocate-revision-karma.py'
--- cronscripts/allocate-revision-karma.py	2010-04-22 17:30:35 +0000
+++ cronscripts/allocate-revision-karma.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/buildd-queue-builder.py'
--- cronscripts/buildd-queue-builder.py	2010-04-22 17:30:35 +0000
+++ cronscripts/buildd-queue-builder.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/buildd-retry-depwait.py'
--- cronscripts/buildd-retry-depwait.py	2010-04-22 17:30:35 +0000
+++ cronscripts/buildd-retry-depwait.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/buildd-slave-scanner.py'
--- cronscripts/buildd-slave-scanner.py	2010-04-22 17:30:35 +0000
+++ cronscripts/buildd-slave-scanner.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/calculate-bug-heat.py'
--- cronscripts/calculate-bug-heat.py	2010-04-22 17:30:35 +0000
+++ cronscripts/calculate-bug-heat.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/check-teamparticipation.py'
--- cronscripts/check-teamparticipation.py	2010-04-22 17:30:35 +0000
+++ cronscripts/check-teamparticipation.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/checkwatches.py'
--- cronscripts/checkwatches.py	2010-04-22 17:30:35 +0000
+++ cronscripts/checkwatches.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/code-import-dispatcher.py'
--- cronscripts/code-import-dispatcher.py	2010-04-22 17:30:35 +0000
+++ cronscripts/code-import-dispatcher.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/create-debwatches.py'
--- cronscripts/create-debwatches.py	2010-04-22 17:30:35 +0000
+++ cronscripts/create-debwatches.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/create_merge_proposals.py'
--- cronscripts/create_merge_proposals.py	2010-04-22 17:30:35 +0000
+++ cronscripts/create_merge_proposals.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/distributionmirror-prober.py'
--- cronscripts/distributionmirror-prober.py	2010-04-22 17:30:35 +0000
+++ cronscripts/distributionmirror-prober.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/expire-archive-files.py'
--- cronscripts/expire-archive-files.py	2010-04-22 17:30:35 +0000
+++ cronscripts/expire-archive-files.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/expire-bugtasks.py'
--- cronscripts/expire-bugtasks.py	2010-04-22 17:30:35 +0000
+++ cronscripts/expire-bugtasks.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/expire-questions.py'
--- cronscripts/expire-questions.py	2010-04-22 17:30:35 +0000
+++ cronscripts/expire-questions.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/flag-expired-memberships.py'
--- cronscripts/flag-expired-memberships.py	2010-04-22 17:30:35 +0000
+++ cronscripts/flag-expired-memberships.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/foaf-update-karma-cache.py'
--- cronscripts/foaf-update-karma-cache.py	2010-04-22 17:30:35 +0000
+++ cronscripts/foaf-update-karma-cache.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/garbo-daily.py'
--- cronscripts/garbo-daily.py	2010-04-22 17:30:35 +0000
+++ cronscripts/garbo-daily.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/garbo-hourly.py'
--- cronscripts/garbo-hourly.py	2010-04-22 17:30:35 +0000
+++ cronscripts/garbo-hourly.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/generate-ppa-htaccess.py'
--- cronscripts/generate-ppa-htaccess.py	2010-04-22 17:30:35 +0000
+++ cronscripts/generate-ppa-htaccess.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/language-pack-exporter.py'
--- cronscripts/language-pack-exporter.py	2010-04-22 17:30:35 +0000
+++ cronscripts/language-pack-exporter.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/librarian-gc.py'
--- cronscripts/librarian-gc.py	2010-04-22 17:30:35 +0000
+++ cronscripts/librarian-gc.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/merge-proposal-jobs.py'
--- cronscripts/merge-proposal-jobs.py	2010-04-28 05:40:02 +0000
+++ cronscripts/merge-proposal-jobs.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009, 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/mirror-prober.sh'
--- cronscripts/mirror-prober.sh	2010-04-28 05:40:02 +0000
+++ cronscripts/mirror-prober.sh	2010-06-08 15:45:42 +0000
@@ -39,10 +39,10 @@
 cd /srv/launchpad.net/production/launchpad/cronscripts
 
 echo '== Distribution mirror prober (archive)' `date` ==
-python2.5 -S distributionmirror-prober.py --content-type=archive --max-mirrors=20
+python -S distributionmirror-prober.py --content-type=archive --max-mirrors=20
 
 echo '== Distribution mirror prober (cdimage)' `date` ==
-python2.5 -S distributionmirror-prober.py --content-type=cdimage --max-mirrors=30
+python -S distributionmirror-prober.py --content-type=cdimage --max-mirrors=30
 
 rm -f $LOCK
 

=== modified file 'cronscripts/nightly.sh'
--- cronscripts/nightly.sh	2010-04-28 05:40:02 +0000
+++ cronscripts/nightly.sh	2010-06-08 15:45:42 +0000
@@ -42,41 +42,41 @@
 cd /srv/launchpad.net/production/launchpad/cronscripts
 
 echo == Expiring memberships `date` ==
-python2.5 -S flag-expired-memberships.py -q
+python -S flag-expired-memberships.py -q
 
 echo == Allocating revision karma `date` ==
-python2.5 -S allocate-revision-karma.py -q
+python -S allocate-revision-karma.py -q
 
 echo == Recalculating karma `date` ==
-python2.5 -S foaf-update-karma-cache.py -q
+python -S foaf-update-karma-cache.py -q
 
 echo == Updating cached statistics `date` ==
-python2.5 -S update-stats.py -q
+python -S update-stats.py -q
 
 echo == Expiring questions `date` ==
-python2.5 -S expire-questions.py
+python -S expire-questions.py
 
 ### echo == Expiring bugs `date` ==
-### python2.5 -S expire-bugtasks.py
+### python -S expire-bugtasks.py
 
 # checkwatches.py is scheduled in the /code/pqm/launchpad_crontabs branch.
 ### echo == Updating bug watches `date` ==
-### python2.5 -S checkwatches.py
+### python -S checkwatches.py
 
 echo == Updating bugtask target name caches `date` ==
-python2.5 -S update-bugtask-targetnamecaches.py -q
+python -S update-bugtask-targetnamecaches.py -q
 
 echo == Updating personal standings `date` ==
-python2.5 -S update-standing.py -q
+python -S update-standing.py -q
 
 echo == Updating CVE database `date` ==
-python2.5 -S update-cve.py -q
+python -S update-cve.py -q
 
 echo == Updating package cache `date` ==
-python2.5 -S update-pkgcache.py -q
+python -S update-pkgcache.py -q
 
 echo == Product Release Finder `date` ==
-python2.5 -S product-release-finder.py -q
+python -S product-release-finder.py -q
 
 
 rm -f $LOCK

=== modified file 'cronscripts/oops-prune.py'
--- cronscripts/oops-prune.py	2010-04-22 17:30:35 +0000
+++ cronscripts/oops-prune.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/parse-librarian-apache-access-logs.py'
--- cronscripts/parse-librarian-apache-access-logs.py	2010-04-22 17:30:35 +0000
+++ cronscripts/parse-librarian-apache-access-logs.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/parse-ppa-apache-access-logs.py'
--- cronscripts/parse-ppa-apache-access-logs.py	2010-04-22 17:30:35 +0000
+++ cronscripts/parse-ppa-apache-access-logs.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/ppa-generate-keys.py'
--- cronscripts/ppa-generate-keys.py	2010-04-22 17:30:35 +0000
+++ cronscripts/ppa-generate-keys.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/process-apport-blobs.py'
--- cronscripts/process-apport-blobs.py	2010-04-22 17:30:35 +0000
+++ cronscripts/process-apport-blobs.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/process-hwdb-submissions.py'
--- cronscripts/process-hwdb-submissions.py	2010-04-22 17:30:35 +0000
+++ cronscripts/process-hwdb-submissions.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/process-mail.py'
--- cronscripts/process-mail.py	2010-04-22 17:30:35 +0000
+++ cronscripts/process-mail.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/process-pending-packagediffs.py'
--- cronscripts/process-pending-packagediffs.py	2010-04-22 17:30:35 +0000
+++ cronscripts/process-pending-packagediffs.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/product-release-finder.py'
--- cronscripts/product-release-finder.py	2010-04-22 17:30:35 +0000
+++ cronscripts/product-release-finder.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/reclaimbranchspace.py'
--- cronscripts/reclaimbranchspace.py	2010-04-22 17:30:35 +0000
+++ cronscripts/reclaimbranchspace.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/rosetta-approve-imports.py'
--- cronscripts/rosetta-approve-imports.py	2010-04-22 17:30:35 +0000
+++ cronscripts/rosetta-approve-imports.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/rosetta-branches.py'
--- cronscripts/rosetta-branches.py	2010-04-28 05:40:02 +0000
+++ cronscripts/rosetta-branches.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/rosetta-export-queue.py'
--- cronscripts/rosetta-export-queue.py	2010-04-22 17:30:35 +0000
+++ cronscripts/rosetta-export-queue.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/rosetta-pofile-stats-daily.py'
--- cronscripts/rosetta-pofile-stats-daily.py	2010-04-22 17:30:35 +0000
+++ cronscripts/rosetta-pofile-stats-daily.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/rosetta-pofile-stats.py'
--- cronscripts/rosetta-pofile-stats.py	2010-04-22 17:30:35 +0000
+++ cronscripts/rosetta-pofile-stats.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/rosetta-poimport.py'
--- cronscripts/rosetta-poimport.py	2010-04-22 17:30:35 +0000
+++ cronscripts/rosetta-poimport.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/scan_branches.py'
--- cronscripts/scan_branches.py	2010-04-22 17:30:35 +0000
+++ cronscripts/scan_branches.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/send-bug-notifications.py'
--- cronscripts/send-bug-notifications.py	2010-04-22 17:30:35 +0000
+++ cronscripts/send-bug-notifications.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/send-person-notifications.py'
--- cronscripts/send-person-notifications.py	2010-04-22 17:30:35 +0000
+++ cronscripts/send-person-notifications.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/sendbranchmail.py'
--- cronscripts/sendbranchmail.py	2010-04-28 05:40:02 +0000
+++ cronscripts/sendbranchmail.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/supermirror-pull.py'
--- cronscripts/supermirror-pull.py	2010-04-28 05:40:02 +0000
+++ cronscripts/supermirror-pull.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/translations-export-to-branch.py'
--- cronscripts/translations-export-to-branch.py	2010-04-22 17:30:35 +0000
+++ cronscripts/translations-export-to-branch.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 # pylint: disable-msg=W0403
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the

=== modified file 'cronscripts/update-bugtask-targetnamecaches.py'
--- cronscripts/update-bugtask-targetnamecaches.py	2010-04-22 17:30:35 +0000
+++ cronscripts/update-bugtask-targetnamecaches.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/update-cve.py'
--- cronscripts/update-cve.py	2010-04-22 17:30:35 +0000
+++ cronscripts/update-cve.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/update-database-stats.py'
--- cronscripts/update-database-stats.py	2010-04-29 12:52:45 +0000
+++ cronscripts/update-database-stats.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 

=== modified file 'cronscripts/update-debwatches.py'
--- cronscripts/update-debwatches.py	2010-04-22 17:30:35 +0000
+++ cronscripts/update-debwatches.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/update-pkgcache.py'
--- cronscripts/update-pkgcache.py	2010-04-22 17:30:35 +0000
+++ cronscripts/update-pkgcache.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/update-remote-product.py'
--- cronscripts/update-remote-product.py	2010-04-22 17:30:35 +0000
+++ cronscripts/update-remote-product.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/update-sourceforge-remote-products.py'
--- cronscripts/update-sourceforge-remote-products.py	2010-04-22 17:30:35 +0000
+++ cronscripts/update-sourceforge-remote-products.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/update-standing.py'
--- cronscripts/update-standing.py	2010-04-22 17:30:35 +0000
+++ cronscripts/update-standing.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/update-stats.py'
--- cronscripts/update-stats.py	2010-04-22 17:30:35 +0000
+++ cronscripts/update-stats.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'cronscripts/upgrade_branches.py'
--- cronscripts/upgrade_branches.py	2010-04-22 17:30:35 +0000
+++ cronscripts/upgrade_branches.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'daemons/cache-database-replication-lag.py'
--- daemons/cache-database-replication-lag.py	2010-04-22 17:30:35 +0000
+++ daemons/cache-database-replication-lag.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'daemons/poppy-upload.py'
--- daemons/poppy-upload.py	2010-04-22 17:30:35 +0000
+++ daemons/poppy-upload.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/replication/initialize.py'
--- database/replication/initialize.py	2010-04-28 05:40:02 +0000
+++ database/replication/initialize.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/replication/new-slave.py'
--- database/replication/new-slave.py	2010-04-28 05:40:02 +0000
+++ database/replication/new-slave.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/replication/preamble.py'
--- database/replication/preamble.py	2010-04-28 05:40:02 +0000
+++ database/replication/preamble.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/replication/repair-restored-db.py'
--- database/replication/repair-restored-db.py	2010-04-28 05:40:02 +0000
+++ database/replication/repair-restored-db.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/replication/report.py'
--- database/replication/report.py	2010-04-28 05:40:02 +0000
+++ database/replication/report.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/replication/slon_ctl.py'
--- database/replication/slon_ctl.py	2010-04-28 05:40:02 +0000
+++ database/replication/slon_ctl.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/replication/sync.py'
--- database/replication/sync.py	2010-04-28 05:40:02 +0000
+++ database/replication/sync.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/diagram.py'
--- database/schema/diagram.py	2010-04-28 05:40:02 +0000
+++ database/schema/diagram.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/emptytables.py'
--- database/schema/emptytables.py	2010-04-28 05:40:02 +0000
+++ database/schema/emptytables.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/fti.py'
--- database/schema/fti.py	2010-04-28 05:40:02 +0000
+++ database/schema/fti.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/online_fti_updater.py'
--- database/schema/online_fti_updater.py	2010-04-28 05:40:02 +0000
+++ database/schema/online_fti_updater.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/pending/add-mailing-list-experts.py'
--- database/schema/pending/add-mailing-list-experts.py	2010-04-28 05:40:02 +0000
+++ database/schema/pending/add-mailing-list-experts.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/pending/create-openid-rp-configs.py'
--- database/schema/pending/create-openid-rp-configs.py	2010-04-28 05:40:02 +0000
+++ database/schema/pending/create-openid-rp-configs.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/pending/fix-rosetta-data.py'
--- database/schema/pending/fix-rosetta-data.py	2010-04-22 17:30:35 +0000
+++ database/schema/pending/fix-rosetta-data.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/pending/gnu-savannah-celebrity.py'
--- database/schema/pending/gnu-savannah-celebrity.py	2010-04-28 05:40:02 +0000
+++ database/schema/pending/gnu-savannah-celebrity.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/pending/import_language_packs.py'
--- database/schema/pending/import_language_packs.py	2010-04-22 17:30:35 +0000
+++ database/schema/pending/import_language_packs.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/pending/migrate_kde_potemplates.py'
--- database/schema/pending/migrate_kde_potemplates.py	2010-04-28 05:40:02 +0000
+++ database/schema/pending/migrate_kde_potemplates.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/pending/new-person-columns.py'
--- database/schema/pending/new-person-columns.py	2010-04-28 05:40:02 +0000
+++ database/schema/pending/new-person-columns.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/pending/prune-nonce.py'
--- database/schema/pending/prune-nonce.py	2010-04-28 05:40:02 +0000
+++ database/schema/pending/prune-nonce.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/pending/update-shippingrequest-types.py'
--- database/schema/pending/update-shippingrequest-types.py	2010-04-28 05:40:02 +0000
+++ database/schema/pending/update-shippingrequest-types.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/pending/update-translation-credits.py'
--- database/schema/pending/update-translation-credits.py	2010-04-28 05:40:02 +0000
+++ database/schema/pending/update-translation-credits.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/reset_sequences.py'
--- database/schema/reset_sequences.py	2010-04-28 05:40:02 +0000
+++ database/schema/reset_sequences.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/security.py'
--- database/schema/security.py	2010-04-28 05:40:02 +0000
+++ database/schema/security.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/sort_sql.py'
--- database/schema/sort_sql.py	2010-04-28 05:40:02 +0000
+++ database/schema/sort_sql.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/unautovacuumable.py'
--- database/schema/unautovacuumable.py	2010-04-28 05:40:02 +0000
+++ database/schema/unautovacuumable.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'database/schema/upgrade.py'
--- database/schema/upgrade.py	2010-04-28 05:40:02 +0000
+++ database/schema/upgrade.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/canonical/launchpad/testing/googletestservice.py'
--- lib/canonical/launchpad/testing/googletestservice.py	2010-04-22 17:30:35 +0000
+++ lib/canonical/launchpad/testing/googletestservice.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/archivepublisher/scripts/generate_ppa_htaccess.py'
--- lib/lp/archivepublisher/scripts/generate_ppa_htaccess.py	2010-04-28 05:40:02 +0000
+++ lib/lp/archivepublisher/scripts/generate_ppa_htaccess.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/archiveuploader/tests/test_signedfiles.py'
--- lib/lp/archiveuploader/tests/test_signedfiles.py	2010-04-22 17:30:35 +0000
+++ lib/lp/archiveuploader/tests/test_signedfiles.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/archiveuploader/tests/test_tagfiles.py'
--- lib/lp/archiveuploader/tests/test_tagfiles.py	2010-04-22 17:30:35 +0000
+++ lib/lp/archiveuploader/tests/test_tagfiles.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/archiveuploader/tests/test_utils.py'
--- lib/lp/archiveuploader/tests/test_utils.py	2010-04-22 17:30:35 +0000
+++ lib/lp/archiveuploader/tests/test_utils.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py'
--- lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py	2010-05-11 12:05:33 +0000
+++ lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py	2010-06-08 15:45:42 +0000
@@ -100,7 +100,7 @@
                     error_status = BugWatchActivityStatus.BACKLINK_FAILED
                     self.linkLaunchpadBug()
             except Exception, ex:
-                error_message = ex.message
+                error_message = str(ex)
                 oops_id = self.error(
                     "Failure updating bug %r on %s (local bug: %s)." %
                         (self.remote_bug, self.external_bugtracker.baseurl,

=== modified file 'lib/lp/code/scripts/tests/test_create_merge_proposals.py'
--- lib/lp/code/scripts/tests/test_create_merge_proposals.py	2010-04-28 05:40:02 +0000
+++ lib/lp/code/scripts/tests/test_create_merge_proposals.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.5
+#! /usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/code/scripts/tests/test_merge_proposal_jobs.py'
--- lib/lp/code/scripts/tests/test_merge_proposal_jobs.py	2010-04-28 05:40:02 +0000
+++ lib/lp/code/scripts/tests/test_merge_proposal_jobs.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.5
+#! /usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/code/scripts/tests/test_scan_branches.py'
--- lib/lp/code/scripts/tests/test_scan_branches.py	2010-05-25 03:13:25 +0000
+++ lib/lp/code/scripts/tests/test_scan_branches.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.5
+#! /usr/bin/python
 #
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/code/scripts/tests/test_sendbranchmail.py'
--- lib/lp/code/scripts/tests/test_sendbranchmail.py	2010-05-25 03:13:25 +0000
+++ lib/lp/code/scripts/tests/test_sendbranchmail.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.5
+#! /usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/codehosting/scanner/tests/test_bzrsync.py'
--- lib/lp/codehosting/scanner/tests/test_bzrsync.py	2010-05-27 02:04:21 +0000
+++ lib/lp/codehosting/scanner/tests/test_bzrsync.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/scripts/utilities/jssize.py'
--- lib/lp/scripts/utilities/jssize.py	2010-04-22 17:30:35 +0000
+++ lib/lp/scripts/utilities/jssize.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/env python
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 

=== modified file 'lib/lp/soyuz/scripts/expire_archive_files.py'
--- lib/lp/soyuz/scripts/expire_archive_files.py	2010-04-22 17:30:35 +0000
+++ lib/lp/soyuz/scripts/expire_archive_files.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/soyuz/scripts/gina/scripts/gina-loggrep'
--- lib/lp/soyuz/scripts/gina/scripts/gina-loggrep	2010-04-22 17:30:35 +0000
+++ lib/lp/soyuz/scripts/gina/scripts/gina-loggrep	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/translations/scripts/reupload_translations.py'
--- lib/lp/translations/scripts/reupload_translations.py	2010-04-22 17:30:35 +0000
+++ lib/lp/translations/scripts/reupload_translations.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.5
+#! /usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/translations/scripts/tests/test_remove_translations.py'
--- lib/lp/translations/scripts/tests/test_remove_translations.py	2010-04-22 17:30:35 +0000
+++ lib/lp/translations/scripts/tests/test_remove_translations.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.5
+#! /usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/translations/scripts/tests/test_reupload_translations.py'
--- lib/lp/translations/scripts/tests/test_reupload_translations.py	2010-04-22 17:30:35 +0000
+++ lib/lp/translations/scripts/tests/test_reupload_translations.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.5
+#! /usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/translations/scripts/tests/test_validate_translations_file.py'
--- lib/lp/translations/scripts/tests/test_validate_translations_file.py	2010-04-22 17:30:35 +0000
+++ lib/lp/translations/scripts/tests/test_validate_translations_file.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.5
+#! /usr/bin/python
 #
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/branch-distro.py'
--- scripts/branch-distro.py	2010-04-28 05:40:02 +0000
+++ scripts/branch-distro.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/branch-rewrite.py'
--- scripts/branch-rewrite.py	2010-04-22 17:30:35 +0000
+++ scripts/branch-rewrite.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -uS
+#!/usr/bin/python -uS
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/bug-export.py'
--- scripts/bug-export.py	2010-04-22 17:30:35 +0000
+++ scripts/bug-export.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/bug-import.py'
--- scripts/bug-import.py	2010-04-22 17:30:35 +0000
+++ scripts/bug-import.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/bugzilla-import.py'
--- scripts/bugzilla-import.py	2010-04-22 17:30:35 +0000
+++ scripts/bugzilla-import.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/cache-country-mirrors.py'
--- scripts/cache-country-mirrors.py	2010-04-22 17:30:35 +0000
+++ scripts/cache-country-mirrors.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/clean-sourceforge-project-entries.py'
--- scripts/clean-sourceforge-project-entries.py	2010-04-22 17:30:35 +0000
+++ scripts/clean-sourceforge-project-entries.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/close-account.py'
--- scripts/close-account.py	2010-04-28 05:40:02 +0000
+++ scripts/close-account.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/code-import-worker-monitor.py'
--- scripts/code-import-worker-monitor.py	2010-05-29 18:44:00 +0000
+++ scripts/code-import-worker-monitor.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/code-import-worker.py'
--- scripts/code-import-worker.py	2010-04-22 17:30:35 +0000
+++ scripts/code-import-worker.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/convert-person-to-team.py'
--- scripts/convert-person-to-team.py	2010-04-22 17:30:35 +0000
+++ scripts/convert-person-to-team.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/copy-translations-from-parent.py'
--- scripts/copy-translations-from-parent.py	2010-05-06 15:30:15 +0000
+++ scripts/copy-translations-from-parent.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/entitlements-to-lp.py'
--- scripts/entitlements-to-lp.py	2010-04-22 17:30:35 +0000
+++ scripts/entitlements-to-lp.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/find-email-clusters.py'
--- scripts/find-email-clusters.py	2010-04-22 17:30:35 +0000
+++ scripts/find-email-clusters.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/_syncorigins.py'
--- scripts/ftpmaster-tools/_syncorigins.py	2010-05-15 17:43:59 +0000
+++ scripts/ftpmaster-tools/_syncorigins.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/env python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/archive-cruft-check.py'
--- scripts/ftpmaster-tools/archive-cruft-check.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/archive-cruft-check.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/archive-integrity-check.py'
--- scripts/ftpmaster-tools/archive-integrity-check.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/archive-integrity-check.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/archive-override-check.py'
--- scripts/ftpmaster-tools/archive-override-check.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/archive-override-check.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/buildd-mass-retry.py'
--- scripts/ftpmaster-tools/buildd-mass-retry.py	2010-04-28 23:02:55 +0000
+++ scripts/ftpmaster-tools/buildd-mass-retry.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/change-override.py'
--- scripts/ftpmaster-tools/change-override.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/change-override.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/copy-package.py'
--- scripts/ftpmaster-tools/copy-package.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/copy-package.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/dak_utils.py'
--- scripts/ftpmaster-tools/dak_utils.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/dak_utils.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 
 # Utility functions from the dak suite
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006  James Troup <[e-mail]>

=== modified file 'scripts/ftpmaster-tools/initialise-from-parent.py'
--- scripts/ftpmaster-tools/initialise-from-parent.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/initialise-from-parent.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/lp-query-distro.py'
--- scripts/ftpmaster-tools/lp-query-distro.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/lp-query-distro.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/lp-remove-package.py'
--- scripts/ftpmaster-tools/lp-remove-package.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/lp-remove-package.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/manage-chroot.py'
--- scripts/ftpmaster-tools/manage-chroot.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/manage-chroot.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/obsolete-distroseries.py'
--- scripts/ftpmaster-tools/obsolete-distroseries.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/obsolete-distroseries.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/ppa-report.py'
--- scripts/ftpmaster-tools/ppa-report.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/ppa-report.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/queue'
--- scripts/ftpmaster-tools/queue	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/queue	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/remove-package.py'
--- scripts/ftpmaster-tools/remove-package.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/remove-package.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/sync-source.py'
--- scripts/ftpmaster-tools/sync-source.py	2010-05-17 14:29:18 +0000
+++ scripts/ftpmaster-tools/sync-source.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ftpmaster-tools/unembargo-package.py'
--- scripts/ftpmaster-tools/unembargo-package.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/unembargo-package.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/get-stacked-on-branches.py'
--- scripts/get-stacked-on-branches.py	2010-04-22 17:30:35 +0000
+++ scripts/get-stacked-on-branches.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/gina.py'
--- scripts/gina.py	2010-04-22 17:30:35 +0000
+++ scripts/gina.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/import-debian-bugs.py'
--- scripts/import-debian-bugs.py	2010-04-22 17:30:35 +0000
+++ scripts/import-debian-bugs.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/import-packagenames.py'
--- scripts/import-packagenames.py	2010-04-22 17:30:35 +0000
+++ scripts/import-packagenames.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/import-zope-specs.py'
--- scripts/import-zope-specs.py	2010-04-22 17:30:35 +0000
+++ scripts/import-zope-specs.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/librarian-report.py'
--- scripts/librarian-report.py	2010-04-22 17:30:35 +0000
+++ scripts/librarian-report.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/linkreport.py'
--- scripts/linkreport.py	2010-04-22 17:30:35 +0000
+++ scripts/linkreport.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/list-team-members'
--- scripts/list-team-members	2010-04-22 17:30:35 +0000
+++ scripts/list-team-members	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/memcached-stats.py'
--- scripts/memcached-stats.py	2010-04-22 17:30:35 +0000
+++ scripts/memcached-stats.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 

=== modified file 'scripts/merge-email-clusters.py'
--- scripts/merge-email-clusters.py	2010-04-22 17:30:35 +0000
+++ scripts/merge-email-clusters.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/migrate-bugzilla-initialcontacts.py'
--- scripts/migrate-bugzilla-initialcontacts.py	2010-04-22 17:30:35 +0000
+++ scripts/migrate-bugzilla-initialcontacts.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/migrate-librarian-content-md5.py'
--- scripts/migrate-librarian-content-md5.py	2010-04-22 17:30:35 +0000
+++ scripts/migrate-librarian-content-md5.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/env python
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 

=== modified file 'scripts/mirror-branch.py'
--- scripts/mirror-branch.py	2010-04-28 05:40:02 +0000
+++ scripts/mirror-branch.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/mlist-import.py'
--- scripts/mlist-import.py	2010-04-22 17:30:35 +0000
+++ scripts/mlist-import.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/mlist-sync.py'
--- scripts/mlist-sync.py	2010-04-22 17:30:35 +0000
+++ scripts/mlist-sync.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/modified-branches.py'
--- scripts/modified-branches.py	2010-04-22 17:30:35 +0000
+++ scripts/modified-branches.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/populate-archive.py'
--- scripts/populate-archive.py	2010-04-22 17:30:35 +0000
+++ scripts/populate-archive.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/ppa-add-missing-builds.py'
--- scripts/ppa-add-missing-builds.py	2010-04-22 17:30:35 +0000
+++ scripts/ppa-add-missing-builds.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/process-accepted.py'
--- scripts/process-accepted.py	2010-04-22 17:30:35 +0000
+++ scripts/process-accepted.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/process-death-row.py'
--- scripts/process-death-row.py	2010-04-22 17:30:35 +0000
+++ scripts/process-death-row.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/process-upload.py'
--- scripts/process-upload.py	2010-04-22 17:30:35 +0000
+++ scripts/process-upload.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/publish-distro.py'
--- scripts/publish-distro.py	2010-04-22 17:30:35 +0000
+++ scripts/publish-distro.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/rosetta/check-distroseries-translations-diffs.py'
--- scripts/rosetta/check-distroseries-translations-diffs.py	2010-04-22 17:30:35 +0000
+++ scripts/rosetta/check-distroseries-translations-diffs.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/rosetta/fix_translation_credits.py'
--- scripts/rosetta/fix_translation_credits.py	2010-04-22 17:30:35 +0000
+++ scripts/rosetta/fix_translation_credits.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/rosetta/gettext_check_messages.py'
--- scripts/rosetta/gettext_check_messages.py	2010-04-22 17:30:35 +0000
+++ scripts/rosetta/gettext_check_messages.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/rosetta/message-sharing-merge.py'
--- scripts/rosetta/message-sharing-merge.py	2010-04-22 17:30:35 +0000
+++ scripts/rosetta/message-sharing-merge.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/rosetta/message-sharing-populate-test.py'
--- scripts/rosetta/message-sharing-populate-test.py	2010-04-22 17:30:35 +0000
+++ scripts/rosetta/message-sharing-populate-test.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/rosetta/message-sharing-populate.py'
--- scripts/rosetta/message-sharing-populate.py	2010-04-22 17:30:35 +0000
+++ scripts/rosetta/message-sharing-populate.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/rosetta/pottery-generate-intltool.py'
--- scripts/rosetta/pottery-generate-intltool.py	2010-04-22 17:30:35 +0000
+++ scripts/rosetta/pottery-generate-intltool.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/rosetta/remove-obsolete-translations.py'
--- scripts/rosetta/remove-obsolete-translations.py	2010-04-22 17:30:35 +0000
+++ scripts/rosetta/remove-obsolete-translations.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/rosetta/remove-translations-by.py'
--- scripts/rosetta/remove-translations-by.py	2010-04-22 17:30:35 +0000
+++ scripts/rosetta/remove-translations-by.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/rosetta/remove-upstream-translations.py'
--- scripts/rosetta/remove-upstream-translations.py	2010-04-22 17:30:35 +0000
+++ scripts/rosetta/remove-upstream-translations.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/rosetta/reupload-translations.py'
--- scripts/rosetta/reupload-translations.py	2010-04-22 17:30:35 +0000
+++ scripts/rosetta/reupload-translations.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/rosetta/share-jaunty-translations.py'
--- scripts/rosetta/share-jaunty-translations.py	2010-04-22 17:30:35 +0000
+++ scripts/rosetta/share-jaunty-translations.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/rosetta/validate-translations-file.py'
--- scripts/rosetta/validate-translations-file.py	2010-04-22 17:30:35 +0000
+++ scripts/rosetta/validate-translations-file.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 

=== modified file 'scripts/script-monitor-nagios.py'
--- scripts/script-monitor-nagios.py	2010-04-22 17:30:35 +0000
+++ scripts/script-monitor-nagios.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/script-monitor.py'
--- scripts/script-monitor.py	2010-04-22 17:30:35 +0000
+++ scripts/script-monitor.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/start-loggerhead.py'
--- scripts/start-loggerhead.py	2010-04-27 01:35:56 +0000
+++ scripts/start-loggerhead.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009, 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/stop-loggerhead.py'
--- scripts/stop-loggerhead.py	2010-04-27 01:35:56 +0000
+++ scripts/stop-loggerhead.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009, 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/update-stacked-on.py'
--- scripts/update-stacked-on.py	2010-04-28 05:40:02 +0000
+++ scripts/update-stacked-on.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'scripts/upload2librarian.py'
--- scripts/upload2librarian.py	2010-04-22 17:30:35 +0000
+++ scripts/upload2librarian.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'sourcecode/Makefile'
--- sourcecode/Makefile	2010-04-22 17:30:35 +0000
+++ sourcecode/Makefile	2010-06-08 15:45:42 +0000
@@ -1,5 +1,4 @@
-PYTHON_VERSION=2.5
-PYTHON=python${PYTHON_VERSION}
+PYTHON=python
 # Not all packages have a working Makefile. Work around this by hardcoding
 # the ones we test.  If we fix them all to have EITHER a good makefile
 # (build and check targets work), or no makefile we can reenable auto
@@ -7,9 +6,7 @@
 build_dirs:=cscvs dulwich pygettextpo pygpgme subvertpy
 test_dirs:=cscvs pygettextpo
 
-TEST_ENV_VARS = \
-  PYTHON=$(PYTHON) \
-  PYTHON_VERSION=$(PYTHON_VERSION)
+TEST_ENV_VARS = PYTHON=$(PYTHON)
 
 all:
 

=== modified file 'test_on_merge.py'
--- test_on_merge.py	2010-04-22 17:30:35 +0000
+++ test_on_merge.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/check-configs.py'
--- utilities/check-configs.py	2010-04-22 17:30:35 +0000
+++ utilities/check-configs.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.5 -S
+#! /usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/check-content-interfaces.py'
--- utilities/check-content-interfaces.py	2010-04-22 17:30:35 +0000
+++ utilities/check-content-interfaces.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.5 -S
+#! /usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/check-db-revision.py'
--- utilities/check-db-revision.py	2010-04-22 17:30:35 +0000
+++ utilities/check-db-revision.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 # Copyright 2010 Canonical Ltd.  All rights reserved.
 
 """

=== modified file 'utilities/check-sampledata.py'
--- utilities/check-sampledata.py	2010-04-22 17:30:35 +0000
+++ utilities/check-sampledata.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.5 -S
+#! /usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/check-scripts.py'
--- utilities/check-scripts.py	2010-04-22 17:30:35 +0000
+++ utilities/check-scripts.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.5 -S
+#! /usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/create-lp-wadl-and-apidoc.py'
--- utilities/create-lp-wadl-and-apidoc.py	2010-04-22 17:30:35 +0000
+++ utilities/create-lp-wadl-and-apidoc.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.5 -S
+#! /usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/ec2'
--- utilities/ec2	2010-04-22 17:30:35 +0000
+++ utilities/ec2	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/findimports.py'
--- utilities/findimports.py	2010-04-22 17:30:35 +0000
+++ utilities/findimports.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/flaky.py'
--- utilities/flaky.py	2010-04-22 17:30:35 +0000
+++ utilities/flaky.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/generate-external-bug-status-docs'
--- utilities/generate-external-bug-status-docs	2010-04-22 17:30:35 +0000
+++ utilities/generate-external-bug-status-docs	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/get-branch-info'
--- utilities/get-branch-info	2010-04-22 17:30:35 +0000
+++ utilities/get-branch-info	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/list-person-references.py'
--- utilities/list-person-references.py	2010-04-22 17:30:35 +0000
+++ utilities/list-person-references.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/lsconf.py'
--- utilities/lsconf.py	2010-04-22 17:30:35 +0000
+++ utilities/lsconf.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/make-dummy-hosted-branches'
--- utilities/make-dummy-hosted-branches	2010-04-22 17:30:35 +0000
+++ utilities/make-dummy-hosted-branches	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/make-lp-user'
--- utilities/make-lp-user	2010-04-22 17:30:35 +0000
+++ utilities/make-lp-user	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/migrater/make_control_file.py'
--- utilities/migrater/make_control_file.py	2010-04-22 17:30:35 +0000
+++ utilities/migrater/make_control_file.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/migrater/migrater.py'
--- utilities/migrater/migrater.py	2010-04-22 17:30:35 +0000
+++ utilities/migrater/migrater.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/mock-code-import'
--- utilities/mock-code-import	2010-04-22 17:30:35 +0000
+++ utilities/mock-code-import	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/on-edge'
--- utilities/on-edge	2010-04-22 17:30:35 +0000
+++ utilities/on-edge	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/page-performance-report.py'
--- utilities/page-performance-report.py	2010-04-22 17:30:35 +0000
+++ utilities/page-performance-report.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/paste'
--- utilities/paste	2010-05-26 18:45:52 +0000
+++ utilities/paste	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/pgbackup.py'
--- utilities/pgbackup.py	2010-04-22 17:30:35 +0000
+++ utilities/pgbackup.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/pgcreate.py'
--- utilities/pgcreate.py	2010-04-22 17:30:35 +0000
+++ utilities/pgcreate.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/pgkillactive.py'
--- utilities/pgkillactive.py	2010-04-22 17:30:35 +0000
+++ utilities/pgkillactive.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/pgkillidle.py'
--- utilities/pgkillidle.py	2010-04-22 17:30:35 +0000
+++ utilities/pgkillidle.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/pglogwatch.py'
--- utilities/pglogwatch.py	2010-04-22 17:30:35 +0000
+++ utilities/pglogwatch.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/pgmassacre.py'
--- utilities/pgmassacre.py	2010-04-22 17:30:35 +0000
+++ utilities/pgmassacre.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/pgrestore.py'
--- utilities/pgrestore.py	2010-04-22 17:30:35 +0000
+++ utilities/pgrestore.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/pgstats.py'
--- utilities/pgstats.py	2010-04-22 17:30:35 +0000
+++ utilities/pgstats.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/qa-ready'
--- utilities/qa-ready	2010-04-22 17:30:35 +0000
+++ utilities/qa-ready	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/roundup-sniffer.py'
--- utilities/roundup-sniffer.py	2010-04-22 17:30:35 +0000
+++ utilities/roundup-sniffer.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/env python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/sanitize-db.py'
--- utilities/sanitize-db.py	2010-04-22 17:30:35 +0000
+++ utilities/sanitize-db.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2010-06-07 14:39:04 +0000
+++ utilities/sourcedeps.conf	2010-06-08 15:45:42 +0000
@@ -9,7 +9,7 @@
 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23
 mailman lp:~launchpad-pqm/mailman/2.1;revno=976
 old_xmlplus lp:~launchpad-pqm/dtdparser/trunk;revno=4
-pygettextpo lp:~launchpad-pqm/pygettextpo/trunk;revno=23
+pygettextpo lp:~launchpad-pqm/pygettextpo/trunk;revno=24
 pygpgme lp:~launchpad-pqm/pygpgme/devel;revno=49
 subvertpy lp:~launchpad-pqm/subvertpy/trunk;revno=2040
 testresources lp:~launchpad-pqm/testresources/dev;revno=16

=== modified file 'utilities/soyuz-sampledata-setup.py'
--- utilities/soyuz-sampledata-setup.py	2010-04-22 17:30:35 +0000
+++ utilities/soyuz-sampledata-setup.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 # pylint: disable-msg=W0403
 
 # Copyright 2010 Canonical Ltd.  This software is licensed under the

=== modified file 'utilities/summarizelogs.py'
--- utilities/summarizelogs.py	2010-04-22 17:30:35 +0000
+++ utilities/summarizelogs.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/top-tests.py'
--- utilities/top-tests.py	2010-04-22 17:30:35 +0000
+++ utilities/top-tests.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/update-revisionauthor-email.py'
--- utilities/update-revisionauthor-email.py	2010-04-22 17:30:35 +0000
+++ utilities/update-revisionauthor-email.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5 -S
+#!/usr/bin/python -S
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/xxxreport.py'
--- utilities/xxxreport.py	2010-04-22 17:30:35 +0000
+++ utilities/xxxreport.py	2010-06-08 15:45:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).