Correcting not Py3-compatible syntax

In Python 3:
* 'dict_values' object has no attribute 'sort'
* 'generator' object has no attribute 'next'
 --> Corresponding method calls replaced with cross-version builtins.
* data read from class files is 'bytes'
 --> 'str' changed to 'bytes', as the latter is present in Py2 as well
* xrange() is not present
 --> replaced with range() (as done everywhere else in 4a6cd21)
* iterkeys(), iteritems() are not present
 --> replaced with keys(), items()

javatools/classinfo.py

@@ -257,7 +257,7 @@ def cli_print_classinfo(options, info):
         # generator skips them.
         cpool = info.cpool
 
-        for i in xrange(1, len(cpool.consts)):
+        for i in range(1, len(cpool.consts)):
             t, v = cpool.pretty_const(i)
             if t:
                 # skipping the None consts, which would be the entries

javatools/dirutils.py

@@ -137,7 +137,7 @@ def _gen_from_dircmp(dc, lpath, rpath):
         yield (BOTH, join(relpath(dc.left, lpath), f))
 
     subdirs = dc.subdirs.values()
-    subdirs.sort()
+    subdirs = sorted(subdirs)
     for sub in subdirs:
         for event in _gen_from_dircmp(sub, lpath, rpath):
             yield event

javatools/distinfo.py

@@ -91,9 +91,9 @@ def _collect_requires_provides(self):
 
         for entry in self.get_jars():
             ji = self.get_jarinfo(entry)
-            for sym, data in ji.get_requires().iteritems():
+            for sym, data in ji.get_requires().items():
                 req.setdefault(sym, []).append((REQ_BY_JAR, entry, data))
-            for sym, data in ji.get_provides().iteritems():
+            for sym, data in ji.get_provides().items():
                 prov.setdefault(sym, []).append((PROV_BY_JAR, entry, data))
                 p.add(sym)
             ji.close()
@@ -107,7 +107,7 @@ def _collect_requires_provides(self):
             for sym in ci.get_provides(private=True):
                 p.add(sym)
 
-        req = dict((k, v) for k, v in req.iteritems() if k not in p)
+        req = dict((k, v) for k, v in req.items() if k not in p)
 
         self._requires = req
         self._provides = prov
@@ -123,7 +123,7 @@ def get_requires(self, ignored=tuple()):
 
         d = self._requires
         if ignored:
-            d = dict((k, v) for k, v in d.iteritems()
+            d = dict((k, v) for k, v in d.items()
                      if not fnmatches(k, *ignored))
         return d
 
@@ -139,7 +139,7 @@ def get_provides(self, ignored=tuple()):
 
         d = self._provides
         if ignored:
-            d = dict((k, v) for k, v in d.iteritems()
+            d = dict((k, v) for k, v in d.items()
                      if not fnmatches(k, *ignored))
         return d
 

javatools/jarinfo.py

@@ -110,7 +110,7 @@ def _collect_requires_provides(self):
             for sym in ci.get_provides(private=True):
                 p.add(sym)
 
-        req = dict((k, v) for k, v in req.iteritems() if k not in p)
+        req = dict((k, v) for k, v in req.items() if k not in p)
 
         self._requires = req
         self._provides = prov
@@ -122,7 +122,7 @@ def get_requires(self, ignored=tuple()):
 
         d = self._requires
         if ignored:
-            d = dict((k, v) for k, v in d.iteritems()
+            d = dict((k, v) for k, v in d.items()
                      if not fnmatches(k, *ignored))
         return d
 
@@ -133,7 +133,7 @@ def get_provides(self, ignored=tuple()):
 
         d = self._provides
         if ignored:
-            d = dict((k, v) for k, v in d.iteritems()
+            d = dict((k, v) for k, v in d.items()
                      if not fnmatches(k, *ignored))
         return d
 
@@ -230,7 +230,7 @@ def cli_jar_classes(options, jarinfo):
 def cli_jar_provides(options, jarinfo):
     print("jar provides:")
 
-    for provided in sorted(jarinfo.get_provides().iterkeys()):
+    for provided in sorted(jarinfo.get_provides().keys()):
         if not fnmatches(provided, *options.api_ignore):
             print(" ", provided)
     print()
@@ -239,7 +239,7 @@ def cli_jar_provides(options, jarinfo):
 def cli_jar_requires(options, jarinfo):
     print("jar requires:")
 
-    for required in sorted(jarinfo.get_requires().iterkeys()):
+    for required in sorted(jarinfo.get_requires().keys()):
         if not fnmatches(required, *options.api_ignore):
             print(" ", required)
     print()

javatools/manifest.py

@@ -356,7 +356,7 @@ def parse(self, data):
         # the first section is the main one for the manifest. It's
         # also where we will check for our newline separator
         sections = parse_sections(data)
-        self.load(sections.next())
+        self.load(next(sections))
 
         # and all following sections are considered sub-sections
         for section in sections:

javatools/pack.py

@@ -344,7 +344,7 @@ def unpack(data):
     unpacker:`
     """
 
-    if isinstance(data, (str, buffer)):
+    if isinstance(data, (bytes, buffer)):
         return BufferUnpacker(data)
 
     elif hasattr(data, "read"):