Use six.iteritems() and six.iterkeys()

to work towards Python3 support

Gbp-Dch: Ignore

diff --git a/gbp/pkg/__init__.py b/gbp/pkg/__init__.py
index 34f81cdaec58513e5c32dfe1fde404500ce0957c..f3a81ae0b5f6fba062306324cc40e4dcd29657b6 100644 (file)
--- a/gbp/pkg/__init__.py
+++ b/gbp/pkg/__init__.py
@@ -21,6 +21,8 @@ import os
 import re
 import glob
 
+import six
+
 import gbp.command_wrappers as gbpc
 from gbp.errors import GbpError
 
@@ -83,7 +85,7 @@ def parse_archive_filename(filename):
             base_name = ".".join(split[:-1])
             (archive_fmt, compression) = (split[-1], None)
         else:
-            for (c, o) in compressor_opts.iteritems():
+            for (c, o) in six.iteritems(compressor_opts):
                 if o[1] == split[-1]:
                     base_name = ".".join(split[:-1])
                     compression = c

diff --git a/gbp/scripts/create_remote_repo.py b/gbp/scripts/create_remote_repo.py
index 821f0600f347fac91eab636a6a709eda22eab6b2..73bd27027bcab3aca809247406113f1740c6a2d9 100644 (file)
--- a/gbp/scripts/create_remote_repo.py
+++ b/gbp/scripts/create_remote_repo.py
@@ -27,6 +27,9 @@ import urlparse
 import subprocess
 import tty, termios
 import re
+
+import six
+
 from gbp.deb.changelog import ChangeLog, NoChangeLogError
 from gbp.command_wrappers import (CommandExecFailed, GitCommand)
 from gbp.config import (GbpOptionParserDebian, GbpOptionGroup)
@@ -68,7 +71,7 @@ def print_config(remote, branches):
 def sort_dict(d):
     """Return a sorted list of (key, value) tuples"""
     s = []
-    for key in sorted(d.iterkeys()):
+    for key in sorted(six.iterkeys(d)):
         s.append((key, d[key]))
     return s
 

diff --git a/tests/02_test_upstream_source_tar_unpack.py b/tests/02_test_upstream_source_tar_unpack.py
index 163b26a1acfc9ca2e62ebf4edcde364a094cec23..02b50439b2302d4cd218a8a81473c192bcc86280 100644 (file)
--- 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)