diff options
| author | Julian Andres Klode <jak@debian.org> | 2014-01-06 12:29:25 +0100 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2014-01-06 12:29:25 +0100 |
| commit | af7a03182edaf58a18e1821d172c0f0dd869c898 (patch) | |
| tree | 52994eb3496e266825eb25e5eaea41635334b472 | |
| parent | 07a71a40c64893e414faf36c722679c5f35c840a (diff) | |
| download | python-apt-af7a03182edaf58a18e1821d172c0f0dd869c898.tar.gz | |
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.
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | 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 <deity@lists.debian.org> Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org> 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"): |