Get all tests in past.builtins.test_builtins passing again on Py2

This disables the execfile() reimplementation on Py2. The Py3 one is still
broken.

Author: edschofield

past/builtins/misc.py

@@ -18,6 +18,7 @@ def apply(f, *args, **kw):
     import __builtin__
     apply = __builtin__.apply
     cmp = __builtin__.cmp
+    execfile = __builtin__.execfile
     intern = __builtin__.intern
     raw_input = __builtin__.raw_input
     reload = __builtin__.reload
@@ -30,50 +31,52 @@ def apply(f, *args, **kw):
     def execfile(filename, myglobals=None, mylocals=None):
         """
         A version of execfile() that handles unicode filenames.
-
         From IPython.
+
+        WARNING: This doesn't seem to work. We may need to use inspect to
+        get the globals and locals dicts from the calling context.
         """
         mylocals = mylocals if (mylocals is not None) else myglobals
         exec_(compile(open(filename).read(), filename, 'exec'),
               myglobals, mylocals)
 
-else:
-    def execfile(filename, myglobals=None, mylocals=None):
-        """
-        A version of execfile() for Py2 that handles unicode filenames.
-        This is useful if "from __future__ import unicode_literals" is in
-        effect.
-
-        From IPython.
-        """
-        if sys.platform == 'win32':
-            # The rstrip() is necessary b/c trailing whitespace in
-            # files will cause an IndentationError in Python 2.6
-            # (this was fixed in 2.7). See IPython issue 1027.
-            scripttext = __builtin__.open(filename).read().rstrip() + '\n'
-            # compile converts unicode filename to str assuming
-            # ascii. Let's do the conversion before calling compile
-            if isinstance(filename, unicode):
-                filename = filename.encode(unicode, 'replace')
-            # else:
-            #     filename = filename
-            exec_(compile(scripttext, filename, 'exec') in glob, loc)
-        else:
-            if isinstance(filename, unicode):
-                filename = filename.encode(sys.getfilesystemencoding())
-            else:
-                filename = filename
-            if mylocals is not None:
-                if myglobals is not None:
-                    __builtin__.execfile(filename, myglobals, mylocals)
-                else:
-                    raise ValueError(
-                        'globals argument is required if locals is passed')
-            else:
-                if myglobals is not None:
-                    __builtin__.execfile(filename, myglobals)
-                else:
-                    __builtin__.execfile(filename)
+# else:
+#     def execfile(filename, myglobals=None, mylocals=None):
+#         """
+#         A version of execfile() for Py2 that handles unicode filenames.
+#         This is useful if "from __future__ import unicode_literals" is in
+#         effect.
+# 
+#         From IPython.
+#         """
+#         if sys.platform == 'win32':
+#             # The rstrip() is necessary b/c trailing whitespace in
+#             # files will cause an IndentationError in Python 2.6
+#             # (this was fixed in 2.7). See IPython issue 1027.
+#             scripttext = __builtin__.open(filename).read().rstrip() + '\n'
+#             # compile converts unicode filename to str assuming
+#             # ascii. Let's do the conversion before calling compile
+#             if isinstance(filename, unicode):
+#                 filename = filename.encode(unicode, 'replace')
+#             # else:
+#             #     filename = filename
+#             exec_(compile(scripttext, filename, 'exec') in glob, loc)
+#         else:
+#             if isinstance(filename, unicode):
+#                 filename = filename.encode(sys.getfilesystemencoding())
+#             else:
+#                 filename = filename
+#             if mylocals is not None:
+#                 if myglobals is not None:
+#                     __builtin__.execfile(filename, myglobals, mylocals)
+#                 else:
+#                     raise ValueError(
+#                         'globals argument is required if locals is passed')
+#             else:
+#                 if myglobals is not None:
+#                     __builtin__.execfile(filename, myglobals)
+#                 else:
+#                     __builtin__.execfile(filename)
 
 if PY3:
     __all__ = ['apply', 'cmp', 'execfile', 'intern', 'raw_input',

past/tests/test_builtins.py

@@ -268,20 +268,20 @@ def __coerce__(self, other):
         self.assertRaises(OverflowError, coerce, 0.5, int("12345" * 1000))
 
     def test_compile(self):
-        compile('print 1\n', '', 'exec')
+        compile('print(1)\n', '', 'exec')
         bom = '\xef\xbb\xbf'
-        compile(bom + 'print 1\n', '', 'exec')
+        compile(bom + 'print(1)\n', '', 'exec')
         compile(source='pass', filename='?', mode='exec')
         compile(dont_inherit=0, filename='tmp', source='0', mode='eval')
         compile('pass', '?', dont_inherit=1, mode='exec')
         self.assertRaises(TypeError, compile)
-        self.assertRaises(ValueError, compile, 'print 42\n', '<string>', 'badmode')
-        self.assertRaises(ValueError, compile, 'print 42\n', '<string>', 'single', 0xff)
+        self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'badmode')
+        self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'single', 0xff)
         self.assertRaises(TypeError, compile, chr(0), 'f', 'exec')
         self.assertRaises(TypeError, compile, 'pass', '?', 'exec',
                           mode='eval', source='0', filename='tmp')
         if True:  # Was: if have_unicode:
-            compile(unicode('print u"\xc3\xa5"\n', 'utf8'), '', 'exec')
+            compile(unicode('print(u"\xc3\xa5"\n)', 'utf8'), '', 'exec')
             self.assertRaises(TypeError, compile, unichr(0), 'f', 'exec')
             self.assertRaises(ValueError, compile, unicode('a = 1'), 'f', 'bad')
 
@@ -484,8 +484,7 @@ def keys(self):
     if True:
         # with check_py3k_warnings(("execfile.. not supported in 3.x",
         #                           DeprecationWarning)):
-        # execfile(TESTFN)
-        pass
+        execfile(TESTFN)
 
     def test_execfile(self):
         global numruns
@@ -988,9 +987,9 @@ def gen():
 
     def test_oct(self):
         self.assertEqual(oct(100), '0144')
-        self.assertEqual(oct(100), '0144L')
+        # self.assertEqual(oct(100L), '0144L')
         self.assertEqual(oct(-100), '-0144')
-        self.assertEqual(oct(-100), '-0144L')
+        # self.assertEqual(oct(-100L), '-0144L')
         self.assertRaises(TypeError, oct, ())
 
     def write_testfile(self):
@@ -1235,12 +1234,12 @@ def test_input_and_raw_input(self):
             # SF 876178: make sure input() respect future options.
             sys.stdin = io.BytesIO(b'1/2')
             sys.stdout = io.BytesIO()
-            exec(compile('print input()', 'test_builtin_tmp', 'exec'))
+            exec(compile('print(input())', 'test_builtin_tmp', 'exec'))
             sys.stdin.seek(0, 0)
-            exec(compile('from __future__ import division;print input()',
+            exec(compile('from __future__ import division;print(input())',
                          'test_builtin_tmp', 'exec'))
             sys.stdin.seek(0, 0)
-            exec(compile('print input()', 'test_builtin_tmp', 'exec'))
+            exec(compile('print(input())', 'test_builtin_tmp', 'exec'))
             # The result we expect depends on whether new division semantics
             # are already in effect.
             if 1/2 == 0: