Ticket #5129: compat3k.execfile.2.diff

setup.py

@@ -10 +10 @@
 try:
     # Load setuptools, to build a specific source package
     import setuptools
+    setuptools  # Silence lint.
 except ImportError:
     pass
 
@@ -20 +21 @@
     """
     Get all extensions from core and all subprojects.
     """
+    from twisted.python.compat3k import execfile
+
     extensions = []
 
     if not sys.platform.startswith('java'):

twisted/names/authority.py

@@ -12 +12 @@
 from twisted.names import dns
 from twisted.internet import defer
 from twisted.python import failure
+from twisted.python.compat3k import execfile
 
 import common
 

twisted/python/_release.py

@@ -25 +25 @@
 from twisted.python.versions import Version
 from twisted.python.filepath import FilePath
 from twisted.python.dist import twisted_subprojects
+from twisted.python.compat3k import execfile
 
 # This import is an example of why you shouldn't use this module unless you're
 # radix
@@ -945 +946 @@
 
     This knows how to build tarballs for Twisted and all of its subprojects.
     """
-    from twisted.python.dist import twisted_subprojects as subprojects
 
     def __init__(self, rootDirectory, outputDirectory, apiBaseURL=None):
         """

twisted/python/compat.py

@@ -68 +68 @@
             raise ValueError("address length incorrect")
         parts = struct.unpack('!8H', addr)
         curBase = bestBase = None
+        bestLen = 0
         for i in range(8):
             if not parts[i]:
                 if curBase is None:
@@ -139 +140 @@
                   '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
@@ -175 +176 @@
     from functools import reduce
 except ImportError:
     reduce = reduce
+
+
+__all__ = [
+    "frozenset",
+    "reduce",
+    "set",
+    ]

twisted/python/compat3k.py

@@ +1 @@
+# -*- test-case-name: twisted.python.test.test_compat3k -*-
+#
+# Copyright (c) Twisted Matrix Laboratories.
+# See LICENSE for details.
+
+
+"""
+Python 3.x compatibility module to provide backwards compatibility for useful
+Python 2.x features, chiefly to aid porting.
+
+This is mainly for use of internal Twisted code. We encourage you to use
+the latest version of Python directly from your code, if possible.
+"""
+
+try:
+    _execfile = execfile
+except NameError:
+    _execfile = None
+
+
+def execfile(filename, globals, locals=None):
+    """Execute a Python script in the given namespaces.
+
+    Similar to the execfile builtin, but a namespace is mandatory, partly
+    because that's a sensible thing to require, and because otherwise we'd
+    have to do some frame hacking.
+
+    This is a compatibility wrapper for Python 3 porting.
+    """
+    if locals is None:
+        locals = globals
+    if _execfile is None:
+        fin = open(filename, "rb")
+        try:
+            source = fin.read()
+        finally:
+            fin.close()
+        code = compile(source, filename, "exec")
+        exec(code, globals, locals)
+    else:
+        _execfile(filename, globals, locals)
+
+
+__all__ = [
+    "execfile",
+    ]

twisted/python/dist.py

@@ -15 +15 @@
 import platform
 import sys
 
+from twisted.python.compat3k import execfile
+
 
 twisted_subprojects = ["conch", "lore", "mail", "names",
                        "news", "pair", "runner", "web",

twisted/python/test/test_compat3k.py

@@ +1 @@
+# Copyright (c) Twisted Matrix Laboratories.
+# See LICENSE for details.
+
+
+"""
+Tests for L{twisted.python.py3compat}.
+"""
+
+import os, tempfile, unittest
+
+from twisted.python.compat3k import execfile
+
+
+class ExecfileCompatTestCase(unittest.TestCase):
+
+    def setUp(self):
+        super(ExecfileCompatTestCase, self).setUp()
+        fd, self.script = tempfile.mkstemp(".py")
+        fout = os.fdopen(fd, "wb")
+        try:
+            fout.write("foo += 1\n".encode("ascii"))
+        finally:
+            fout.close()
+
+    def tearDown(self):
+        super(ExecfileCompatTestCase, self).tearDown()
+        os.unlink(self.script)
+
+    def test_execfile_globals(self):
+        ns_global = {"foo": 1}
+        execfile(self.script, ns_global)
+        self.assertEqual(2, ns_global["foo"])
+
+    def test_execfile_globals_and_locals(self):
+        ns_global, ns_local = {"foo": 10}, {"foo": 20}
+        execfile(self.script, ns_global, ns_local)
+        self.assertEqual(10, ns_global["foo"])
+        self.assertEqual(21, ns_local["foo"])

twisted/python/test/test_release.py

@@ -21 +21 @@
 from twisted.trial.unittest import TestCase
 
 from twisted.python.compat import set
+from twisted.python.compat3k import execfile
 from twisted.python.procutils import which
 from twisted.python import release
 from twisted.python.filepath import FilePath
@@ -50 +51 @@
 # Check a bunch of dependencies to skip tests if necessary.
 try:
     from twisted.lore.scripts import lore
+    lore  # Silence lint.
 except ImportError:
     loreSkip = "Lore is not present."
 else:

twisted/topfiles/5129.misc

@@ +1 @@
+Replace usage of execfile() with t.p.compat3k.execfile(), a new
+function that wraps execfile() on Python 2.x and provides equivalent
+functionality on Python 3.x.

twisted/web/script.py

@@ -9 +9 @@
 import os, traceback
 
 try:
-    import cStringIO as StringIO
+    import cStringIO
+    StringIO = cStringIO  # Silence lint.
 except ImportError:
     import StringIO
 
 from twisted import copyright
+from twisted.python.compat3k import execfile
 from twisted.web import http, server, static, resource, html