Futurize pass 2

requirements-dev.txt

@@ -5,3 +5,6 @@ diff_cover
 mock
 pytest
 pytest-cov
+# dependencies also in setup.py until they can be used
+six
+future

setup.py

@@ -35,5 +35,7 @@
                 ],
       requires=[
           'branding',
+          'six',
+          'future',
       ],
      )

tests/test_cpio.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import os
 import shutil
 import subprocess
@@ -45,8 +46,9 @@ def setUp(self):
         check_call("gzip -c < archive.cpio > archive.cpio.gz")
         check_call("bzip2 -c < archive.cpio > archive.cpio.bz2")
         try:
-            import lzma
-            self.doXZ = subprocess.call("xz --check=crc32 --lzma2=dict=1MiB < archive.cpio > archive.cpio.xz", shell=True) == 0
+            import lzma         # pylint: disable=unused-variable
+            self.doXZ = subprocess.call("xz --check=crc32 --lzma2=dict=1MiB"
+                                        " < archive.cpio > archive.cpio.xz", shell=True) == 0
         except Exception as ex:
             # FIXME will issue warning even if test_xz is not requested
             warnings.warn("will not test cpio.xz: %s" % ex)
@@ -113,7 +115,7 @@ def test_bz2(self):
     def test_xz(self):
         if not self.doXZ:
             raise unittest.SkipTest("lzma package or xz tool not available")
-        print 'Running test for XZ'
+        print('Running test for XZ')
         self.doArchive('archive.cpio.xz', 'xz')
 
     # CpioFileCompat testing

tests/test_ifrename_dynamic.py

@@ -1,12 +1,10 @@
+from __future__ import unicode_literals
 import json
 import logging
 import unittest
 from copy import deepcopy
 
-try:
-    import cStringIO as StringIO
-except ImportError:
-    import StringIO
+from io import StringIO
 
 from xcp.net.ifrename.dynamic import DynamicRules
 from xcp.net.ifrename.macpci import MACPCI
@@ -16,7 +14,7 @@
 class TestLoadAndParse(unittest.TestCase):
 
     def setUp(self):
-        self.logbuf = StringIO.StringIO()
+        self.logbuf = StringIO()
         openLog(self.logbuf, logging.NOTSET)
 
     def tearDown(self):
@@ -26,7 +24,7 @@ def tearDown(self):
 
     def test_null(self):
 
-        fd = StringIO.StringIO("")
+        fd = StringIO("")
         dr = DynamicRules(fd=fd)
 
         self.assertTrue(dr.load_and_parse())
@@ -36,7 +34,7 @@ def test_null(self):
 
     def test_empty(self):
 
-        fd = StringIO.StringIO(
+        fd = StringIO(
             '{"lastboot":[],"old":[]}'
             )
         dr = DynamicRules(fd=fd)
@@ -48,7 +46,7 @@ def test_empty(self):
 
     def test_one_invalid(self):
 
-        fd = StringIO.StringIO(
+        fd = StringIO(
             '{"lastboot":[["","",""]],"old":[]}'
             )
         dr = DynamicRules(fd=fd)
@@ -60,7 +58,7 @@ def test_one_invalid(self):
 
     def test_one_valid_lastboot(self):
 
-        fd = StringIO.StringIO(
+        fd = StringIO(
             '{"lastboot":[["01:23:45:67:89:0a","00:10.2","eth2"]],"old":[]}'
             )
         dr = DynamicRules(fd=fd)
@@ -74,7 +72,7 @@ def test_one_valid_lastboot(self):
 
     def test_one_valid_lastboot2(self):
 
-        fd = StringIO.StringIO(
+        fd = StringIO(
             '{"lastboot":[],"old":[["01:23:45:67:89:0a","00:10.2","eth2"]]}'
             )
         dr = DynamicRules(fd=fd)
@@ -88,7 +86,7 @@ def test_one_valid_lastboot2(self):
 class TestGenerate(unittest.TestCase):
 
     def setUp(self):
-        self.logbuf = StringIO.StringIO()
+        self.logbuf = StringIO()
         openLog(self.logbuf, logging.NOTSET)
 
     def tearDown(self):
@@ -149,7 +147,7 @@ def test_pci_missing(self):
 class TestSave(unittest.TestCase):
 
     def setUp(self):
-        self.logbuf = StringIO.StringIO()
+        self.logbuf = StringIO()
         openLog(self.logbuf, logging.NOTSET)
 
     def tearDown(self):

tests/test_ifrename_logic.py

@@ -1,12 +1,11 @@
+from __future__ import print_function
+from __future__ import unicode_literals
 import logging
 import sys
 import unittest
 from copy import deepcopy
 
-try:
-    import cStringIO as StringIO
-except ImportError:
-    import StringIO
+from io import StringIO
 
 from xcp.net.ifrename.logic import *
 from xcp.logger import LOG, openLog, closeLogs
@@ -34,7 +33,7 @@ def apply_transactions(lst, trans):
 class TestSimpleLogic(unittest.TestCase):
 
     def setUp(self):
-        self.siobuff = StringIO.StringIO()
+        self.siobuff = StringIO()
         openLog(self.siobuff, logging.NOTSET)
 
     def tearDown(self):
@@ -43,15 +42,15 @@ def tearDown(self):
         self.siobuff.close()
 
     def debug_state(self, ts):
-        print >>sys.stderr, ""
-        print >>sys.stderr, self.siobuff.getvalue()
-        print >>sys.stderr, ""
+        print("", file=sys.stderr)
+        print(self.siobuff.getvalue(), file=sys.stderr)
+        print("", file=sys.stderr)
         if len(ts):
             for (s,d) in ts:
-                print >>sys.stderr, "'%s' -> '%s'" % (s, d)
+                print("'%s' -> '%s'" % (s, d), file=sys.stderr)
         else:
-            print >>sys.stderr, "No transactions"
-        print >>sys.stderr, ""
+            print("No transactions", file=sys.stderr)
+        print("", file=sys.stderr)
 
 
     def test_newhw_norules_1eth(self):
@@ -259,7 +258,7 @@ def test_1drule_1eth_already_complete(self):
 class TestUseCases(unittest.TestCase):
 
     def setUp(self):
-        self.siobuff = StringIO.StringIO()
+        self.siobuff = StringIO()
         openLog(self.siobuff, logging.NOTSET)
 
     def tearDown(self):
@@ -268,16 +267,16 @@ def tearDown(self):
         self.siobuff.close()
 
     def debug_state(self, ts):
-        print >>sys.stderr, ""
-        print >>sys.stderr, self.siobuff.getvalue()
-        print >>sys.stderr, ""
+        print("", file=sys.stderr)
+        print(self.siobuff.getvalue(), file=sys.stderr)
+        print("", file=sys.stderr)
         if len(ts):
-            print >>sys.stderr, "Transactions:"
+            print("Transactions:", file=sys.stderr)
             for (s,d) in ts:
-                print >>sys.stderr, "'%s' -> '%s'" % (s, d)
+                print("'%s' -> '%s'" % (s, d), file=sys.stderr)
         else:
-            print >>sys.stderr, "No transactions"
-        print >>sys.stderr, ""
+            print("No transactions", file=sys.stderr)
+        print("", file=sys.stderr)
 
     def test_usecase1(self):
         """
@@ -533,7 +532,7 @@ def setUp(self):
         set to None and a tname set to the 'eth'
         """
 
-        self.siobuff = StringIO.StringIO()
+        self.siobuff = StringIO()
         openLog(self.siobuff)
 
 
@@ -559,7 +558,7 @@ def assertNotRaises(self, excp, fn, *argl, **kwargs):
         """Because unittest.TestCase seems to be missing this functionality"""
         try:
             fn(*argl, **kwargs)
-        except excp, e:
+        except excp as e:
             self.fail("function raised %s unexpectedly: %s"
                       % (excp, e))