Ticket #4244: setup3k.diff

twisted/python/versions.py

@@ -209 +209 @@
             formatFile = os.path.join(svn, 'format')
             if os.path.exists(formatFile):
                 # It looks like a less-than-version-10 working copy.
-                format = file(formatFile).read().strip()
+                format = open(formatFile).read().strip()
                 parser = getattr(self, '_parseSVNEntries_' + format, None)
             else:
                 # It looks like a version-10-or-greater working copy, which
@@ -220 +220 @@
                 return 'Unknown'
 
             entriesFile = os.path.join(svn, 'entries')
-            entries = file(entriesFile)
+            entries = open(entriesFile)
             try:
                 try:
                     return parser(entries)

twisted/python/dist.py

@@ -12 +12 @@
 from distutils import core
 from distutils.core import Extension
 
+try:
+    execfile
+except NameError:
+    from twisted.python.compat3k import execfile
+
 twisted_subprojects = ["conch", "lore", "mail", "names",
                        "news", "pair", "runner", "web", "web2",
                        "words", "vfs"]
@@ -277 +282 @@
         for f in os.listdir(self.build_dir):
             fpath=os.path.join(self.build_dir, f)
             if not fpath.endswith(".py"):
-                try:
+                if os.path.exists(fpath + ".py"):
                     os.unlink(fpath + ".py")
-                except EnvironmentError, e:
-                    if e.args[1]=='No such file or directory':
-                        pass
                 os.rename(fpath, fpath + ".py")
 
 

twisted/python/compat3k.py

@@ +1 @@
+def execfile(filename, *args):
+    return exec(compile(open(filename).read(), filename, 'exec'), *args)

twisted/python/compat.py

@@ -135 +135 @@
                   'set_connect_state', 'set_accept_state',
                   'connect_ex', 'sendall'):
 
-            exec """def %s(self, *args):
+            exec("""def %s(self, *args):
                 self._lock.acquire()
                 try:
                     return apply(self._ssl_conn.%s, args)
                 finally:
-                    self._lock.release()\n""" % (f, f)
+                    self._lock.release()\n""" % (f, f))
 sys.modules['OpenSSL.tsafe'] = tsafe
 
 import operator

setup.py

@@ -15 +15 @@
 
 import sys, os
 
+try:
+    execfile
+except NameError:
+    from twisted.python.compat3k import execfile
 
 def getExtensions():
     """
@@ -81 +85 @@
         try:
             list(parse_requirements(requirements))
         except:
-            print """You seem to be running a very old version of setuptools.
+            print("""You seem to be running a very old version of setuptools.
 This version of setuptools has a bug parsing dependencies, so automatic
 dependency resolution is disabled.
-"""
+""")
         else:
             setup_args['install_requires'] = requirements
         setup_args['include_package_data'] = True
         setup_args['zip_safe'] = False
+        if getattr(setuptools, '_distribute', False): # set to True in distribute
+            setup_args['use_2to3'] = True
+            if (3,1) <= sys.version_info < (3,2):
+                # fix_callable chokes on twisted/trial/test/test_pyunitcompat.py
+                # reported as http://bugs.python.org/issue7810
+                from distutils.util import Mixin2to3
+                import lib2to3.refactor
+                Mixin2to3.fixer_names = lib2to3.refactor.get_fixers_from_package('lib2to3.fixes')
+                Mixin2to3.fixer_names.remove('lib2to3.fixes.fix_callable')
     setup(**setup_args)