Use dict iteration methods common to both Python 2 and 3.

The .items, .keys, and .values methods in Python 2 make copies, so the
test framework uses the .iter* flavors of those methods. But in Python
3 those .iter* (and even the 2.7 .view*) flavors are removed and the
original methods return views.

Measurements were taken under Python2 to see what impact the copying
had, and there was none. Thus it is not worth the effort to avoid.

Reported as a compatibility issue by 2to3.

Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py
index 731a9fc7..a1f3645d 100644
--- a/test/pacman/pmtest.py
+++ b/test/pacman/pmtest.py
@@ -58,7 +58,7 @@ class pmtest(object):
         """Find a package object matching the name and version specified in
         either sync databases or the local package collection. The local database
         is allowed to match if allow_local is True."""
-        for db in self.db.itervalues():
+        for db in self.db.values():
             if db.is_local and not allow_local:
                 continue
             pkg = db.getpkg(name)
@@ -151,7 +151,7 @@ class pmtest(object):
             vprint("\t%s" % os.path.join(util.TMPDIR, pkg.filename()))
             pkg.finalize()
             pkg.makepkg(tmpdir)
-        for key, value in self.db.iteritems():
+        for key, value in self.db.items():
             for pkg in value.pkgs:
                 pkg.finalize()
             if key == "local" and not self.createlocalpkgs:
@@ -167,7 +167,7 @@ class pmtest(object):
 
         # Creating sync database archives
         vprint("    Creating databases")
-        for key, value in self.db.iteritems():
+        for key, value in self.db.items():
             vprint("\t" + value.treename)
             value.generate()