minimal tweaks to update for python3

lib/vsc/install/headers.py

@@ -93,7 +93,8 @@ def get_header(filename, script=False):
     if not os.path.isfile(filename):
         raise Exception('get_header filename %s not found' % filename)
 
-    txt = open(filename).read()
+    with open(filename) as filey:
+        txt = filey.read()
 
     blocks = HEADER_REGEXP.split(txt)
     if len(blocks) == 1:
@@ -162,10 +163,9 @@ def begin_end_from_header(header):
 
 def _write(filename, content):
     """Simple wrapper around open().write for unittesting"""
-    fh = open(filename, 'w')
-    fh.write(content)
-    fh.close()
-
+    with open(filename, 'w') as fh:
+        fh.write(content)
+
 
 def check_header(filename, script=False, write=False):
     """
@@ -226,7 +226,8 @@ def check_header(filename, script=False, write=False):
 
     if write and changed:
         log.info('write enabled and different header. Going to modify file %s' % filename)
-        wholetext = open(filename).read()
+        with open(filename) as filey:
+            wholetext = filey.read()
         newtext = ''
         if shebang is not None:
             newtext += shebang + "\n"

lib/vsc/install/shared_setup.py

@@ -30,7 +30,19 @@
 @author: Stijn De Weirdt (Ghent University)
 @author: Andy Georges (Ghent University)
 """
-import __builtin__
+# Python 2
+try:
+    import __builtin__
+
+# Python 3
+except ImportError:
+    import builtins as __builtin__
+
+try:
+    basestring
+except NameError:
+    from past.builtins import basestring
+
 import glob
 import hashlib
 import inspect
@@ -109,7 +121,7 @@ def _log(self, level, msg, args):
             try:
                 return self._orig_log(self, level, newmsg, args)
             except Exception:
-                print newmsg % args
+                print(newmsg % args)
 
     log.Log = NewLog
     log._global_log = NewLog()
@@ -361,13 +373,15 @@ def get_name_url(self, filename=None, version=None, license_name=None):
         if len(res) != 3:
             raise Exception("Cannot determine name, url and download url from filename %s: got %s" % (filename, res))
         else:
+            keepers = dict()
             for name, value in res.items():
                 if value is None:
                     log.info('Removing None %s' % name)
-                    res.pop(name)
+                else:
+                    keepers[name] = value
 
-            log.info('get_name_url returns %s' % res)
-            return res
+            log.info('get_name_url returns %s' % keepers)
+            return keepers
 
     def rel_gitignore(self, paths, base_dir=None):
         """
@@ -1047,7 +1061,7 @@ def finalize_options(self):
 
         def _print(self, cmd):
             """Print is evil, cmd is list"""
-            print ' '.join(cmd)
+            print(' '.join(cmd))
 
         def git_tag(self):
             """Tag the version in git"""
@@ -1201,10 +1215,17 @@ def sanitize(name):
             klass = _fvs('sanitize')
             return ",".join([klass.sanitize(r) for r in name])
 
+
+
     @staticmethod
     def get_md5sum(filename):
         """Use this function to compute the md5sum in the KNOWN_LICENSES hash"""
-        return hashlib.md5(open(filename).read()).hexdigest()
+        hasher = hashlib.md5()
+        with open(filename, "rb") as f:
+            for chunk in iter(lambda: f.read(4096), b""):
+                hasher.update(chunk)
+        return hasher.hexdigest()
+
 
     def get_license(self, license_name=None):
         """
@@ -1254,13 +1275,15 @@ def parse_target(self, target, urltemplate=None):
 
         # update the cmdclass with ones from vsc_setup_klass
         # cannot do this in one go, when SHARED_TARGET is defined, vsc_setup doesn't exist yet
+        keepers = new_target.copy()
         for name, klass in new_target['cmdclass'].items():
             try:
                 new_target['cmdclass'][name] = getattr(vsc_setup_klass, klass.__name__)
             except AttributeError:
-                del new_target['cmdclass'][name]
+                print("Not including new_target['cmdclass']['%s']" %name)
 
         # prepare classifiers
+        new_target = keepers
         classifiers = new_target.setdefault('classifiers', [])
 
         # license info
@@ -1385,7 +1408,7 @@ def parse_target(self, target, urltemplate=None):
                                                            dep, depversion])]
 
         log.debug("New target = %s" % (new_target))
-        print new_target
+        print(new_target)
         return new_target
 
     @staticmethod
@@ -1410,8 +1433,8 @@ def build_setup_cfg_for_bdist_rpm(target):
 
         try:
             setup_cfg = open('setup.cfg', 'w')  # and truncate
-        except (IOError, OSError), err:
-            print "Cannot create setup.cfg for target %s: %s" % (target['name'], err)
+        except (IOError, OSError) as err:
+            print("Cannot create setup.cfg for target %s: %s" % (target['name'], err))
             sys.exit(1)
 
         klass = _fvs('build_setup_cfg_for_bdist_rpm')

lib/vsc/install/testing.py

@@ -36,7 +36,16 @@
 import re
 import sys
 
-from cStringIO import StringIO
+try:
+    basestring
+except NameError:
+    from past.builtins import basestring
+
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from io import StringIO
+
 from unittest import TestCase as OrigTestCase
 from vsc.install.headers import nicediff
 
@@ -54,6 +63,7 @@ class TestCase(OrigTestCase):
     # pylint: disable=arguments-differ
     def assertEqual(self, a, b, msg=None):
         """Make assertEqual always print useful messages"""
+
         try:
             super(TestCase, self).assertEqual(a, b)
         except AssertionError as e:
@@ -120,7 +130,7 @@ def assertErrorRegex(self, error, regex, call, *args, **kwargs):
             str_kwargs = ['='.join([k, str(v)]) for (k, v) in kwargs.items()]
             str_args = ', '.join(map(str, args) + str_kwargs)
             self.assertTrue(False, "Expected errors with %s(%s) call should occur" % (call.__name__, str_args))
-        except error, err:
+        except error as err:
             msg = self.convert_exception_to_str(err)
             if isinstance(regex, basestring):
                 regex = re.compile(regex)

test/headers.py

@@ -111,8 +111,8 @@ def test_gen_license_header(self):
         }
         for license in KNOWN_LICENSES.keys():
             res_fn = os.path.join(self.setup.REPO_TEST_DIR, 'headers', license)
-            result = open(res_fn).read()
-
+            with open(res_fn) as filey:
+                result = filey.read()
             gen_txt = gen_license_header(license, **data)
             self.assertEqual(gen_txt, result, msg='generated header for license %s as expected' % license)
             log.info('generated license header %s' % license)

test/shared_setup.py

@@ -111,7 +111,7 @@ def test_rel_gitignore(self):
         try:
             self.setup.rel_gitignore(['testdata'], base_dir=base_dir)
         except Exception as e:
-            self.assertTrue('.pyc' in e.message, msg=e)
+            self.assertTrue('.pyc' in str(e))
         else:
             self.assertTrue(False, 'rel_gitignore should have raised an exception, but did not!')
         # it should not fail if base_dir does not contain a .git folder
@@ -127,8 +127,8 @@ def test_action_target(self):
         """Test action_target function, mostly w.r.t. backward compatibility."""
         def fake_setup(*args, **kwargs):
             """Fake setup function to test action_target with."""
-            print 'args: ', args
-            print 'kwargs:', kwargs
+            print('args: ', args)
+            print('kwargs:', kwargs)
 
         self.mock_stdout(True)
         action_target({'name': 'vsc-test', 'version': '1.0.0'}, setupfn=fake_setup)
@@ -150,6 +150,7 @@ def test_prepare_rpm(self):
         """
         Test the prepare rpm function
         especially in effect to generating correct package list wrt excluded_pkgs_rpm
+        we assume the order of the lists doesn't matter (and sort to compare)
         """
         package = {
             'name': 'vsc-test',
@@ -161,7 +162,12 @@ def test_prepare_rpm(self):
         libdir = os.path.join(os.path.dirname(os.path.realpath(__file__)), './testdata')
         setup.REPO_LIB_DIR = libdir
         setup.prepare_rpm(package)
-        self.assertEqual(setup.SHARED_TARGET['packages'], ['vsc', 'vsc.test'])
+
+        # Generate list of packages, sorted
+        package_list = list(setup.SHARED_TARGET['packages'])
+        package_list.sort()
+
+        self.assertEqual(package_list, ['vsc', 'vsc.test'])
         package = {
             'name': 'vsc-test',
             'excluded_pkgs_rpm': ['vsc', 'vsc.test'],
@@ -170,7 +176,12 @@ def test_prepare_rpm(self):
         setup = vsc_setup()
         setup.REPO_LIB_DIR = libdir
         setup.prepare_rpm(package)
-        self.assertEqual(setup.SHARED_TARGET['packages'], ['vsc', 'vsc.test'])
+
+        # Generate list of packages, sorted
+        package_list = list(setup.SHARED_TARGET['packages'])
+        package_list.sort()
+
+        self.assertEqual(package_list, ['vsc', 'vsc.test'])
 
     def test_parse_target(self):
         """Test for parse target"""

test/testdata/.gitignore

@@ -0,0 +1,3 @@
+.pyc
+.pyo
+~