Python3 support

bin/make_package_info.py

@@ -11,7 +11,7 @@
 
 try:
     import yaml
-except ImportError, err:
+except ImportError as err:
     die(ENOYAML)
 
 def get_config():
@@ -67,13 +67,13 @@ def check_config(config):
         module = config['version_from_module']
         del config['version_from_module']
         ns = {}
-        exec('import ' + module) in ns
+        exec(('import ' + module), ns)
         config['version'] = ns[module].__version__
 
     if 'description' not in config:
         module = config['name']
         ns = {}
-        exec('import ' + module) in ns
+        exec(('import ' + module), ns)
         desc = ns[module].__doc__
         m = re.match(r'\s*([^\.\!\n]*)', desc)
         if m:
@@ -111,15 +111,15 @@ def get():
 
     file = 'package/info.py'
     action = os.path.exists(file) and 'Updated' or 'Created'
-    print "%(action)s the '%(file)s' module for this package." % locals()
+    print("%(action)s the '%(file)s' module for this package." % locals())
 
     f = open(file, 'w')
     f.write(module)
     f.close()
 
 def update_template(config, file):
     if not os.path.exists(file):
-        print "Warning: %s does not exist." % file
+        print("Warning: %s does not exist." % file)
         return
     f = open(file, 'r')
     text = f.read()
@@ -128,12 +128,12 @@ def update_template(config, file):
         return
     try:
         text = text % config
-    except KeyError, err:
+    except KeyError as err:
         die(EBADINFO, err=err)
     f = open(file, 'w')
     f.write(text)
     f.close()
-    print "Updated '%s' with your info" % file
+    print("Updated '%s' with your info" % file)
 
 def add_failing_tests(config):
     file = "%s/__init__.py" % config['name']

layout/package/__init__.py

@@ -14,10 +14,10 @@
 try:
     from setuptools import setup as real_setup
     has_setuptools = True
-except ImportError, err:
+except ImportError as err:
     try:
         from distutils.core import setup as real_setup
-    except ImportError, err:
+    except ImportError as err:
         die(ENOSETUP)
 
 class setup():
@@ -29,7 +29,7 @@ def __init__(self):
     def get_args(self):
         try:
             import package.info
-        except ImportError, err:
+        except ImportError as err:
             die(ENOINFO)
 
         args = package.info.get()

layout/package/unittest.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import os
 
@@ -17,7 +17,7 @@ def assertTextEquals(self, got, expected, msg=None):
             file('got', 'w').write(got)
             os.system('diff -u expected got')
 
-        self.assertEquals(got, expected, msg)
+        self.assertEqual(got, expected, msg)
 
 class main():
     def __init__(self, module='__main__', argv=None):

setup.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # coding=utf-8
 
-print """
+print("""
 Greetings!
 
 It looks like you are trying to install this package (called `package`). STOP!
@@ -28,5 +28,5 @@
 
 Enjoy!
 
-"""
+""")