Python3 porting driven by extension of test coverage

Author: ydirson

.github/workflows/main.yml

@@ -21,7 +21,7 @@ jobs:
           pip install -r requirements-dev.txt
           # FIXME: branding.py still has no permanent home
           curl https://gist.github.com/ydirson/3c36a7e19d762cc529a6c82340894ccc/raw/5ca39f621b1feab813e171f535c1aad1bd483f1d/branding.py -O -L
-          pip install pyliblzma
+          pip install pyliblzma configparser
           pip install -e .
           command -v xz
 

tests/test_xmlunwrap.py

@@ -18,18 +18,18 @@ def test(self):
 
         self.assertEqual([getText(el)
                           for el in getElementsByTagName(self.top_el, ["fred"])],
-                         ["text1", "text2"])
+                         [b"text1", b"text2"])
 
-        x = getMapAttribute(self.top_el, ["mode"], [('test', 42), ('stuff', 77)])
+        x = getMapAttribute(self.top_el, ["mode"], [(b'test', 42), (b'stuff', 77)])
         self.assertEqual(x, 42)
-        x = getMapAttribute(self.top_el, ["made"], [('test', 42), ('stuff', 77)],
-                            default='stuff')
+        x = getMapAttribute(self.top_el, ["made"], [(b'test', 42), (b'stuff', 77)],
+                            default=b'stuff')
         self.assertEqual(x, 77)
 
         x = getStrAttribute(self.top_el, ["mode"])
-        self.assertEqual(x, "test")
+        self.assertEqual(x, b"test")
         x = getStrAttribute(self.top_el, ["made"])
-        self.assertEqual(x, "")
+        self.assertEqual(x, b"")
         x = getStrAttribute(self.top_el, ["made"], None)
         self.assertEqual(x, None)
 

xcp/cpiofile.py

@@ -1418,15 +1418,17 @@ def extractall(self, path=".", members=None):
                 # Extract directory with a safe mode, so that
                 # all files below can be extracted as well.
                 try:
-                    os.makedirs(os.path.join(path, cpioinfo.name), 0o777)
+                    os.makedirs(
+                        os.path.join(path, six.ensure_text(cpioinfo.name)),
+                        0o777)
                 except EnvironmentError:
                     pass
                 directories.append(cpioinfo)
             else:
                 self.extract(cpioinfo, path)
 
         # Reverse sort directories.
-        directories.sort(lambda a, b: cmp(a.name, b.name))
+        directories.sort(key=lambda x: x.name)
         directories.reverse()
 
         # Set correct owner, mtime and filemode on directories.
@@ -1461,7 +1463,8 @@ def extract(self, member, path=""):
             cpioinfo._link_path = path
 
         try:
-            self._extract_member(cpioinfo, os.path.join(path, cpioinfo.name))
+            self._extract_member(
+                cpioinfo, os.path.join(path, six.ensure_text(cpioinfo.name)))
         except EnvironmentError as e:
             if self.errorlevel > 0:
                 raise

xcp/repository.py

@@ -23,10 +23,10 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import md5
+from hashlib import md5
 import os.path
 import xml.dom.minidom
-import ConfigParser
+import configparser
 
 import six
 
@@ -181,8 +181,8 @@ def _getVersion(cls, access, category):
         access.start()
         try:
             treeinfofp = access.openAddress(cls.TREEINFO_FILENAME)
-            treeinfo = ConfigParser.SafeConfigParser()
-            treeinfo.readfp(treeinfofp)
+            treeinfo = configparser.ConfigParser()
+            treeinfo.read_file(treeinfofp)
             treeinfofp.close()
             if treeinfo.has_section('system-v1'):
                 ver_str = treeinfo.get('system-v1', category_map[category])
@@ -247,7 +247,7 @@ def findRepositories(cls, access):
     def __init__(self, access, base, is_group = False):
         BaseRepository.__init__(self, access, base)
         self.is_group = is_group
-        self._md5 = md5.new()
+        self._md5 = md5()
         self.requires = []
         self.packages = []
 
@@ -289,7 +289,7 @@ def _parse_repofile(self, repofile):
         repofile.close()
 
         # update md5sum for repo
-        self._md5.update(repofile_contents)
+        self._md5.update(repofile_contents.encode())
 
         # build xml doc object
         try:

xcp/xmlunwrap.py

@@ -44,11 +44,11 @@ def getElementsByTagName(el, tags, mandatory = False):
         raise XmlUnwrapError("Missing mandatory element %s" % tags[0])
     return matching
 
-def getStrAttribute(el, attrs, default = '', mandatory = False):
+def getStrAttribute(el, attrs, default=b'', mandatory=False):
     matching = []
     for attr in attrs:
         val = el.getAttribute(attr).encode()
-        if val != '':
+        if val != b'':
             matching.append(val)
     if len(matching) == 0:
         if mandatory: