From a47cd2bb49eee4954aa79c5c7b2a36a4d78963fc Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Fri, 11 Jul 2014 16:38:06 -0400
Subject: [PATCH] Minor cleanups in debian/pyversions.py
---
debian/changelog | 1 +
debian/pyversions.py | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0b2f2a0..ed93313 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ python-defaults (2.7.7-1) UNRELEASED; urgency=medium
* Drop unused build-depends on libhtml-tree-perl
* Clarify discussion of requirement to use python:Provides (Closes: #669346)
* Add clarification of naming requirements for submocules (Closes: #701192)
+ * Minor cleanups in debian/pyversions.py
-- Matthias Klose <doko@debian.org> Mon, 02 Jun 2014 19:54:25 +0200
diff --git a/debian/pyversions.py b/debian/pyversions.py
index 602ce12..b9eee89 100644
--- a/debian/pyversions.py
+++ b/debian/pyversions.py
@@ -56,9 +56,9 @@ def parse_versions(vstring, add_exact=False):
raise ValueError('error parsing Python-Version attribute')
op, v = m.group(1), m.group(2)
vmaj, vmin = v.split('.')
- # Don't silently ignore Python 3 versions for Squeeze.
- #if int(vmaj) > 2:
- # continue
+ # Don't silently ignore Python 3 versions.
+ if int(vmaj) > 2:
+ raise ValueError('error parsing Python-Version attribute, Python 3 version found')
if op in (None, '='):
exact_versions.add(v)
else:
@@ -172,7 +172,7 @@ def default_version(version_only=False):
try:
debian_default = read_default('default-version')
except ValueError:
- debian_default = "python2.6"
+ debian_default = "python2.7"
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
--
GitLab