* Update hard coded fallbacks in debian/pyversions.py to add python2.6 to

    supported versions and to make it the default version

modified:
  debian/changelog
  debian/pyversions.py

debian/changelog

@@ -11,6 +11,8 @@ python-defaults (2.6.5-6) UNRELEASED; urgency=low
     - python: Add an unversioned `2to3' binary (Change pending in Debian)
     - python-minimal: Provide symlink to binary and manpage for
       /usr/bin/python2 (Closes: #566266)
+  * Update hard coded fallbacks in debian/pyversions.py to add python2.6 to
+    supported versions and to make it the default version
 
  -- Scott Kitterman <scott@kitterman.com>  Sun, 27 Jun 2010 14:53:31 -0400
 

debian/pyversions.py

@@ -133,7 +133,7 @@ def supported_versions(version_only=False):
             if not _supported_versions:
                 # last resort: python-minimal not installed, apt-cache
                 # not available, hard code the value, #394084
-                _supported_versions = ['python2.5',]
+                _supported_versions = ['python2.5', 'python2.6']
     if version_only:
         return [v[6:] for v in _supported_versions]
     else:
@@ -163,7 +163,7 @@ def default_version(version_only=False):
         try:
             debian_default = read_default('default-version')
         except ValueError:
-            debian_default = "python2.5"
+            debian_default = "python2.6"
         if not _default_version in (debian_default, os.path.join('/usr/bin', debian_default)):
             raise ValueError, "/usr/bin/python does not match the python default version. It must be reset to point to %s" % debian_default
         _default_version = debian_default