From 2816c80e27f08ff715ac8f8ef4b77dc678fc606a Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Thu, 19 Feb 2015 13:09:31 +0100 Subject: Use six.iteritems() and six.iterkeys() to work towards Python3 support Gbp-Dch: Ignore --- tests/02_test_upstream_source_tar_unpack.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/02_test_upstream_source_tar_unpack.py b/tests/02_test_upstream_source_tar_unpack.py index 163b26a..02b5043 100644 --- a/tests/02_test_upstream_source_tar_unpack.py +++ b/tests/02_test_upstream_source_tar_unpack.py @@ -8,6 +8,8 @@ import os import tarfile import unittest +import six + import gbp.pkg class TestUnpack(unittest.TestCase): @@ -46,7 +48,7 @@ class TestUnpack(unittest.TestCase): context.teardown() def test_upstream_source_type(self): - for (comp, archive) in self.archives.iteritems(): + for (comp, archive) in six.iteritems(self.archives): source = gbp.pkg.UpstreamSource(archive[0]) assert source.is_orig() == True assert source.is_dir() == False @@ -57,13 +59,13 @@ class TestUnpack(unittest.TestCase): assert type(source.unpacked) == str def test_upstream_source_unpack(self): - for (comp, archive) in self.archives.iteritems(): + for (comp, archive) in six.iteritems(self.archives): source = gbp.pkg.UpstreamSource(archive[0]) source.unpack(".") self._check_files(archive[1], comp) def test_upstream_source_unpack_no_filter(self): - for (comp, archive) in self.archives.iteritems(): + for (comp, archive) in six.iteritems(self.archives): source = gbp.pkg.UpstreamSource(archive[0]) source.unpack(".", []) self._check_files(archive[1], comp) @@ -71,7 +73,7 @@ class TestUnpack(unittest.TestCase): def test_upstream_source_unpack_filtered(self): exclude = "README" - for (comp, archive) in self.archives.iteritems(): + for (comp, archive) in six.iteritems(self.archives): source = gbp.pkg.UpstreamSource(archive[0]) source.unpack(".", [exclude]) archive[1].remove(exclude) -- cgit v1.2.3