From 7fd512f22177d4745843d8d282cbb8a964915a21 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 20 Nov 2012 09:44:23 +0100 Subject: tests/*.py: Do not prepend None to sys.path, Python 3.3 redeems that with an unintelligible crash. --- debian/changelog | 7 +++++++ tests/test_apt_cache.py | 4 +++- tests/test_debfile.py | 4 +++- tests/test_debfile_multiarch.py | 4 +++- tests/test_tagfile.py | 4 +++- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4a7a0485..6bfacedf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.8.8ubuntu5) UNRELEASED; urgency=low + + * tests/*.py: Do not prepend None to sys.path, Python 3.3 redeems that with + an unintelligible crash. + + -- Martin Pitt Tue, 20 Nov 2012 09:43:36 +0100 + python-apt (0.8.8ubuntu4) raring; urgency=low * tests/test_apt_cache.py, tests/test_lp659438.py, tests/test_progress.py: diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index fe90eb8a..21dfeb98 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -23,7 +23,9 @@ else: from test_all import get_library_dir -sys.path.insert(0, get_library_dir()) +libdir = get_library_dir() +if libdir: + sys.path.insert(0, libdir) import apt import apt_pkg diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 04a6b65a..75c46966 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -13,7 +13,9 @@ import unittest from test_all import get_library_dir import sys -sys.path.insert(0, get_library_dir()) +libdir = get_library_dir() +if libdir: + sys.path.insert(0, libdir) import apt_pkg import apt.debfile diff --git a/tests/test_debfile_multiarch.py b/tests/test_debfile_multiarch.py index 5e6d0b9a..bbf62016 100644 --- a/tests/test_debfile_multiarch.py +++ b/tests/test_debfile_multiarch.py @@ -13,7 +13,9 @@ import unittest from test_all import get_library_dir import sys -sys.path.insert(0, get_library_dir()) +libdir = get_library_dir() +if libdir: + sys.path.insert(0, libdir) import apt import apt_pkg import apt.debfile diff --git a/tests/test_tagfile.py b/tests/test_tagfile.py index 33197e6a..f26f851b 100644 --- a/tests/test_tagfile.py +++ b/tests/test_tagfile.py @@ -21,7 +21,9 @@ import tempfile import unittest from test_all import get_library_dir -sys.path.insert(0, get_library_dir()) +libdir = get_library_dir() +if libdir: + sys.path.insert(0, libdir) import apt_pkg -- cgit v1.2.3