Ticket #4244: execfile.diff

twisted/python/dist.py

@@ -15 +15 @@
 from distutils import core
 from distutils.core import Extension
 
-try:
-    execfile
-except NameError:
-    from twisted.python.compat import execfile
+from twisted.python.compat import execfile
 
 
 twisted_subprojects = ["conch", "lore", "mail", "names",

twisted/python/compat.py

@@ -15 +15 @@
 import sys, string, socket, struct
 
 
-def execfile(filename, *args):
-    return exec(compile(open(filename).read(), filename, 'exec'), *args)
+if sys.version_info >= (3,0):
+    # 3.x doesn't have execfile anymore, so we define our own
+    # The code below is syntactically valid 2.x, but 2.x thinks that a tuple
+    # gets passed to the exec statement.
+    def execfile(filename, globals=None, locals=None):
+        exec(compile(open(filename).read(), filename, 'exec'), globals, locals)
+else:
+    from __builtin__ import execfile
 
 
 def inet_pton(af, addr):

setup.py

@@ -16 +16 @@
 import sys, os
 
 
-try:
-    execfile
-except NameError:
-    from twisted.python.compat import execfile
+from twisted.python.compat import execfile
 
 
 def getExtensions():