diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-10-20 12:37:57 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-10-20 12:37:57 +0200 |
| commit | ec7d0cf0f90a4acd5ff0d25915f21e4b522740ed (patch) | |
| tree | ba9de5f5805c52b52151df75163d942189ae2942 /tests | |
| parent | c3010e4ba29bda3c2751f7dc7d40049bd2199798 (diff) | |
Kill six.iteritems
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/02_test_upstream_source_tar_unpack.py | 10 | ||||
| -rw-r--r-- | tests/20_test_rpm.py | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/tests/02_test_upstream_source_tar_unpack.py b/tests/02_test_upstream_source_tar_unpack.py index ec4983d7..7ce02867 100644 --- a/tests/02_test_upstream_source_tar_unpack.py +++ b/tests/02_test_upstream_source_tar_unpack.py @@ -8,8 +8,6 @@ import os import tarfile import unittest -import six - import gbp.pkg @@ -49,7 +47,7 @@ class TestUnpack(unittest.TestCase): context.teardown() def test_upstream_source_type(self): - for (comp, archive) in six.iteritems(self.archives): + for (comp, archive) in self.archives.items(): source = gbp.pkg.UpstreamSource(archive[0]) assert source.is_orig() is True assert source.is_dir() is False @@ -60,13 +58,13 @@ class TestUnpack(unittest.TestCase): assert type(source.unpacked) == str def test_upstream_source_unpack(self): - for (comp, archive) in six.iteritems(self.archives): + for (comp, archive) in self.archives.items(): 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 six.iteritems(self.archives): + for (comp, archive) in self.archives.items(): source = gbp.pkg.UpstreamSource(archive[0]) source.unpack(".", []) self._check_files(archive[1], comp) @@ -74,7 +72,7 @@ class TestUnpack(unittest.TestCase): def test_upstream_source_unpack_filtered(self): exclude = "README.md" - for (comp, archive) in six.iteritems(self.archives): + for (comp, archive) in self.archives.items(): source = gbp.pkg.UpstreamSource(archive[0]) source.unpack(".", [exclude]) archive[1].remove(exclude) diff --git a/tests/20_test_rpm.py b/tests/20_test_rpm.py index 61675a84..d42d68bc 100644 --- a/tests/20_test_rpm.py +++ b/tests/20_test_rpm.py @@ -22,8 +22,6 @@ import shutil import tempfile from nose.tools import assert_raises, eq_, ok_ # pylint: disable=E0611 -import six - from gbp.errors import GbpError from gbp.rpm import (SpecFile, SrcRpmFile, NoSpecError, guess_spec, guess_spec_repo, spec_from_repo) @@ -299,7 +297,7 @@ class TestSpecFile(RpmTestBase): spec = SpecFileTester(spec_filepath) # Check all the tags - for name, val in six.iteritems(spec.protected('_tags')): + for name, val in spec.protected('_tags').items(): rval = None if name in ('version', 'release', 'epoch'): rval = '0' |