* debian/pyversions.py: Exclude python3 versions from results - those are

    handled by py3versions in python3-defaults

modified:
  debian/changelog
  debian/pyversions.py

debian/changelog

@@ -5,7 +5,11 @@ python-defaults (2.6.5-2) UNRELEASED; urgency=low
   * debian/copyright: Add a note about dh_python2, pycompile, pyclean and
     debpython module in
 
- -- Matthias Klose <doko@debian.org>  Tue, 18 May 2010 12:28:25 +0200
+  [ Scott Kitterman ]
+  * debian/pyversions.py: Exclude python3 versions from results - those are
+    handled by py3versions in python3-defaults
+
+ -- Matthias Klose <doko@debian.org>  Tue, 18 May 2010 12:28:25 +0200  Sat, 05 Jun 2010 18:59:57 -0400
 
 python-defaults (2.6.5-1) experimental; urgency=low
 

debian/pyversions.py

@@ -48,7 +48,12 @@ def parse_versions(vstring, add_exact=False):
         ve = re.compile('(>=|<=|<<|=)? *(\d\.\d)$')
         m = ve.match(field)
         try:
+            if not m:
+                raise ValueError('error parsing Python-Version attribute')
             op, v = m.group(1), m.group(2)
+            vmaj, vmin = v.split('.')
+            if int(vmaj) > 2:
+                continue
             if op in (None, '='):
                 exact_versions.add(v)
             else:
@@ -201,7 +206,7 @@ def requested_versions(vstring, version_only=False):
         if 'vexact' in vinfo:
             versions.update(vinfo['vexact'])
     else:
-        raise ValueError, 'error in version string'
+        raise ValueError, 'No python versions in version string'
     if not versions:
         raise PyCentralEmptyValueError, 'empty set of versions'
     if version_only: