Adds dict utils (iteritems(), itervalues(), ...)

reprounzip-vagrant/reprounzip/unpackers/vagrant/__init__.py

@@ -29,7 +29,7 @@
     composite_action, target_must_exist, make_unique_name, shell_escape, \
     load_config, select_installer, busybox_url, join_root
 from reprounzip.unpackers.vagrant.interaction import interactive_shell
-from reprounzip.utils import unicode_
+from reprounzip.utils import unicode_, iteritems
 
 
 class IgnoreMissingKey(MissingHostKeyPolicy):
@@ -252,7 +252,7 @@ def vagrant_setup_create(args):
             cmd = 'cd %s && ' % shell_escape(run['workingdir'])
             cmd += '/usr/bin/env -i '
             cmd += ' '.join('%s=%s' % (k, shell_escape(v))
-                            for k, v in run['environ'].items())
+                            for k, v in iteritems(run['environ']))
             cmd += ' '
             # FIXME : Use exec -a or something if binary != argv[0]
             cmd += ' '.join(

reprounzip/reprounzip/common.py

@@ -94,7 +94,7 @@ def load_config(filename, canonical, File=File, Package=Package):
 
     ver = LooseVersion(config['version'])
 
-    keys_ = set(config.keys())
+    keys_ = set(config)
     if 'version' not in keys_:
         raise InvalidConfig("Missing version")
     # Accepts versions from 0.2 to 0.3 inclusive

reprounzip/reprounzip/pack_info.py

@@ -20,7 +20,7 @@
 
 from reprounzip.unpackers.common import load_config, COMPAT_OK, COMPAT_MAYBE, \
     COMPAT_NO
-from reprounzip.utils import hsize
+from reprounzip.utils import iteritems, hsize
 
 
 def print_info(args, unpackers):
@@ -122,7 +122,7 @@ def print_info(args, unpackers):
     # Unpacker compatibility
     print("----- Unpackers -----")
     unpacker_status = {}
-    for name, upk in unpackers.items():
+    for name, upk in iteritems(unpackers):
         if 'test_compatibility' in upk:
             compat = upk['test_compatibility']
             if callable(compat):

reprounzip/reprounzip/unpackers/common.py

@@ -20,7 +20,7 @@
 import tarfile
 
 import reprounzip.common
-from reprounzip.utils import irange
+from reprounzip.utils import irange, itervalues
 
 
 THIS_DISTRIBUTION = platform.linux_distribution()[0].lower()
@@ -117,7 +117,7 @@ def install(self, packages, assume_yes=False):
 
         # Checks on packages
         pkgs_status = self.get_packages_info(packages)
-        for pkg, status in pkgs_status.itervalues():
+        for pkg, status in itervalues(pkgs_status):
             if status is not None:
                 required_pkgs.discard(pkg.name)
         if required_pkgs:

reprounzip/reprounzip/unpackers/default.py

@@ -28,7 +28,7 @@
 from reprounzip.unpackers.common import THIS_DISTRIBUTION, load_config, \
     select_installer, target_must_exist, shell_escape, busybox_url, \
     join_root, PKG_NOT_INSTALLED, COMPAT_OK, COMPAT_NO
-from reprounzip.utils import unicode_, download_file
+from reprounzip.utils import unicode_, iteritems, download_file
 
 
 def installpkgs(args):
@@ -161,7 +161,7 @@ def directory_create(args):
                     unicode_(join_root(root,
                                        Path(run['workingdir']))))
             cmd += ' '.join('%s=%s' % (k, shell_escape(v))
-                            for k, v in run['environ'].items())
+                            for k, v in iteritems(run['environ']))
             cmd += ' '
             path = [PosixPath(d)
                     for d in run['environ'].get('PATH', '').split(':')]
@@ -307,7 +307,7 @@ def chroot_create(args):
             cmd = 'cd %s && ' % shell_escape(run['workingdir'])
             cmd += '/usr/bin/env -i '
             cmd += ' '.join('%s=%s' % (k, shell_escape(v))
-                            for k, v in run['environ'].items())
+                            for k, v in iteritems(run['environ']))
             cmd += ' '
             # FIXME : Use exec -a or something if binary != argv[0]
             cmd += ' '.join(

reprounzip/reprounzip/unpackers/graph.py

@@ -26,7 +26,8 @@
 from reprounzip.common import FILE_READ, FILE_WRITE, FILE_WDIR, load_config
 from reprounzip.orderedset import OrderedSet
 from reprounzip.unpackers.common import COMPAT_OK
-from reprounzip.utils import PY3, CommonEqualityMixin, escape, unicode_
+from reprounzip.utils import PY3, unicode_, iteritems, escape, \
+    CommonEqualityMixin
 
 
 C_INITIAL = 0   # First process or don't know
@@ -213,7 +214,7 @@ def generate(target, directory, all_forks=False):
         fp.write('\n    node [shape=ellipse];\n\n    /* system packages */\n')
 
         # Files from packages
-        for i, ((name, version), files) in enumerate(package_files.items()):
+        for i, ((name, version), files) in enumerate(iteritems(package_files)):
             fp.write('    subgraph cluster%d {\n        label=' % i)
             if version:
                 fp.write('"%s %s";\n' % (escape(name), escape(version)))

reprounzip/reprounzip/utils.py

@@ -29,11 +29,17 @@
     from urllib.request import Request, urlopen
     izip = zip
     irange = range
+    iteritems = dict.items
+    itervalues = dict.values
+    listvalues = lambda d: list(d.values())
 else:
     from urllib2 import Request, HTTPError, URLError, urlopen
     import itertools
     izip = itertools.izip
     irange = xrange
+    iteritems = dict.iteritems
+    itervalues = dict.itervalues
+    listvalues = dict.values
 
 
 if PY3:

reprozip/reprozip/common.py

@@ -94,7 +94,7 @@ def load_config(filename, canonical, File=File, Package=Package):
 
     ver = LooseVersion(config['version'])
 
-    keys_ = set(config.keys())
+    keys_ = set(config)
     if 'version' not in keys_:
         raise InvalidConfig("Missing version")
     # Accepts versions from 0.2 to 0.3 inclusive

reprozip/reprozip/tracer/linux_pkgs.py

@@ -19,6 +19,7 @@
 import subprocess
 
 from reprozip.common import Package
+from reprozip.utils import listvalues
 
 
 magic_dirs = ('/dev', '/proc', '/sys')
@@ -117,4 +118,4 @@ def identify_packages(files):
     for f in files:
         manager.search_for_file(f)
 
-    return manager.unknown_files, manager.packages.values()
+    return manager.unknown_files, listvalues(manager.packages)

reprozip/reprozip/tracer/trace.py

@@ -25,7 +25,8 @@
 from reprozip.orderedset import OrderedSet
 from reprozip.tracer.linux_pkgs import magic_dirs, system_dirs, \
     identify_packages
-from reprozip.utils import PY3, izip, hsize, find_all_links
+from reprozip.utils import PY3, izip, itervalues, listvalues, hsize, \
+    find_all_links
 
 
 class TracedFile(File):
@@ -185,7 +186,7 @@ def get_files(conn):
     # Displays a warning for READ_THEN_WRITTEN files
     read_then_written_files = [
             fi
-            for fi in files.values()
+            for fi in itervalues(files)
             if fi.what == TracedFile.READ_THEN_WRITTEN and
             not any(fi.path.lies_under(m) for m in magic_dirs)]
     if read_then_written_files:
@@ -196,7 +197,7 @@ def get_files(conn):
                 ", ".join(fi.path for fi in read_then_written_files))
 
     files = [fi
-             for fi in files.values()
+             for fi in itervalues(files)
              if fi.what != TracedFile.WRITTEN and not any(fi.path.lies_under(m)
                                                           for m in magic_dirs)]
     return files, inputs, outputs
@@ -217,7 +218,7 @@ def merge_files(newfiles, newpackages, oldfiles, oldpackages):
             packages[oldpkg.name] = oldpkg
         else:
             packages[oldpkg.name] = oldpkg
-    packages = list(packages.values())
+    packages = listvalues(packages)
 
     return files, packages
 

reprozip/reprozip/utils.py

@@ -29,11 +29,17 @@
     from urllib.request import Request, urlopen
     izip = zip
     irange = range
+    iteritems = dict.items
+    itervalues = dict.values
+    listvalues = lambda d: list(d.values())
 else:
     from urllib2 import Request, HTTPError, URLError, urlopen
     import itertools
     izip = itertools.izip
     irange = xrange
+    iteritems = dict.iteritems
+    itervalues = dict.itervalues
+    listvalues = dict.values
 
 
 if PY3: