From af7a03182edaf58a18e1821d172c0f0dd869c898 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 6 Jan 2014 12:29:25 +0100 Subject: Drop support for Python 2.6 This will allow us to use more Python 3 idioms in the code, and possibly even get a single code base that works in Python 2.7 and Python 3.3 and newer. --- debian/control | 4 ++-- tests/test_all.py | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/debian/control b/debian/control index ab6d11e1..428c5bba 100644 --- a/debian/control +++ b/debian/control @@ -4,14 +4,14 @@ Priority: standard Maintainer: APT Development Team Uploaders: Michael Vogt , Julian Andres Klode Standards-Version: 3.9.4 -XS-Python-Version: >= 2.6 +XS-Python-Version: >= 2.7 X-Python3-Version: >= 3.3 Build-Depends: apt (>= 0.9.6), apt-utils, debhelper (>= 9), fakeroot, libapt-pkg-dev (>= 0.8.11), - python-all-dev (>= 2.6.6-3~), + python-all-dev (>= 2.7), python-all-dbg, python3-all-dev (>= 3.3), python3-all-dbg (>= 3.3), diff --git a/tests/test_all.py b/tests/test_all.py index de6cb0c0..180712f9 100644 --- a/tests/test_all.py +++ b/tests/test_all.py @@ -6,17 +6,10 @@ # notice and this notice are preserved. """Run all available unit tests.""" import os +import unittest.runner +import unittest import sys -try: - import unittest.runner - import unittest - unittest # pyflakes -except ImportError: - # py2.6 compat - import unittest2 as unittest - - # workaround for py3.2 that apparently does not have this anymore # it has "abiflags" if not hasattr(sys, "pydebug"): -- cgit v1.2.3