Don't disable obsolete Py2 names with from future.builtins import *

edschofield · edschofield · commit 071f8e725d12 · 2013-10-05T23:39:30.000+10:00
- These can still be disabled if needed using::

    from future.builtins.disabled import *

But they can be handy -- e.g. for user code like this:

    if PY2:
        if isinstance(x, long):
            ...
diff --git a/future/builtins/__init__.py b/future/builtins/__init__.py
@@ -19,17 +19,12 @@
 if not utils.PY3:
     # We only import names that shadow the builtins on Py2. No other namespace
     # pollution on Py2.
-    from future.builtins.disabled import (apply, cmp, coerce,
-            execfile, file, long, raw_input, reduce, reload, unicode,
-            xrange, StandardError)
     
     # Only shadow builtins on Py2; no new names
     __all__ = ['filter', 'map', 'zip', 
-               'ascii', 'oct', 'hex', 'chr', 'int', 'input', 'open',
-               'str', 'bytes', 'range', 'round', 'super',
-               'apply', 'cmp', 'coerce', 'execfile', 'file', 'long',
-               'raw_input', 'reduce', 'reload', 'unicode', 'xrange',
-               'StandardError']
+               'ascii', 'chr', 'hex', 'input', 'oct', 'open',
+               'bytes', 'int', 'range', 'round', 'str', 'super',
+              ]
 
 else:
     # No namespace pollution on Py3
diff --git a/future/tests/test_explicit_imports.py b/future/tests/test_explicit_imports.py
@@ -30,18 +30,18 @@ def test_py2k_disabled_builtins(self):
         On Py2 these should import.
         """
         if not utils.PY3:
-            from future.builtins import (apply,
-                                         cmp,
-                                         coerce,
-                                         execfile,
-                                         file,
-                                         long,
-                                         raw_input,
-                                         reduce,
-                                         reload,
-                                         unicode,
-                                         xrange,
-                                         StandardError)
+            from future.builtins.disabled import (apply,
+                                                  cmp,
+                                                  coerce,
+                                                  execfile,
+                                                  file,
+                                                  long,
+                                                  raw_input,
+                                                  reduce,
+                                                  reload,
+                                                  unicode,
+                                                  xrange,
+                                                  StandardError)
 
 
 if __name__ == '__main__':
