Ticket #5129: py3-execfile-5129.apply-to-r33601.diff

twisted/test/test_compat.py

@@ -206 +206 @@
     Tests for the Python 3-friendly L{execfile} implementation.
     """
 
-    def setUp(self):
-        self.script = FilePath(self.mktemp())
-        self.script.setContent("foo += 1\n")
+    def writeScript(self, content):
+        """
+        Write L{content} to a new temporary file, returning the L{FilePath}
+        for the new file.
+        """
+        script = FilePath(self.mktemp())
+        script.setContent(content.encode("ascii"))
+        return script
 
 
     def test_execfileGlobals(self):
         """
         L{execfile} executes the specified file in the given global namespace.
         """
+        script = self.writeScript("foo += 1\n")
         globalNamespace = {"foo": 1}
-        execfile(self.script.path, globalNamespace)
+        execfile(script.path, globalNamespace)
         self.assertEqual(2, globalNamespace["foo"])
 
 
@@ -225 +231 @@
         L{execfile} executes the specified file in the given global and local
         namespaces.
         """
+        script = self.writeScript("foo += 1\n")
         globalNamespace = {"foo": 10}
         localNamespace = {"foo": 20}
-        execfile(self.script.path, globalNamespace, localNamespace)
+        execfile(script.path, globalNamespace, localNamespace)
         self.assertEqual(10, globalNamespace["foo"])
         self.assertEqual(21, localNamespace["foo"])
+
+
+    def test_execfileUniversalNewlines(self):
+        """
+        L{execfile} reads in the specified file using universal newlines so
+        that scripts written on one platform will work on another.
+        """
+        for lineEnding in "\n", "\r", "\r\n":
+            script = self.writeScript("foo = 'okay'" + lineEnding)
+            globalNamespace = {"foo": None}
+            execfile(script.path, globalNamespace)
+            self.assertEqual("okay", globalNamespace["foo"])

twisted/python/compat.py

@@ -191 +191 @@
     """
     if locals is None:
         locals = globals
-    fin = open(filename, "rb")
+    fin = open(filename, "rbU")
     try:
         source = fin.read()
     finally:

twisted/python/test/test_dist.py

@@ -79 +79 @@
     def writeSetup(self, name, *path):
         """
         Write out a C{setup.py} file to a location determined by
-        L{self.basedir} and L{path}. L{self.setup_template} is used to
+        L{self.basedir} and L{path}. L{self.setupTemplate} is used to
         generate its contents.
         """
         outdir = self.basedir.descendant(path)