Christian Heimes added the comment:
Here is a fixer for the new name.
Added file: http://bugs.python.org/file8843/2to3_builtins.patch
__________________________________
Tracker <[EMAIL PROTECTED]>
<http://bugs.python.org/issue1535>
__________________________________
Index: tests/test_fixers.py
===================================================================
--- tests/test_fixers.py (Revision 59235)
+++ tests/test_fixers.py (Arbeitskopie)
@@ -1270,7 +1270,10 @@
fixer = "imports"
modules = {"StringIO": ("io", ["StringIO"]),
- "cStringIO": ("io", ["StringIO"])}
+ "cStringIO": ("io", ["StringIO"]),
+ "__builtin__" : ("builtins", ["open", "Exception",
+ "__debug__", "str"]),
+ }
def test_import_module(self):
for old, (new, members) in self.modules.items():
@@ -1285,11 +1288,11 @@
def test_import_from(self):
for old, (new, members) in self.modules.items():
for member in members:
- b = "from %s import %s" % (old, ", ".join(members))
- a = "from %s import %s" % (new, ", ".join(members))
+ b = "from %s import %s" % (old, member)
+ a = "from %s import %s" % (new, member)
self.check(b, a)
- s = "from foo import %s" % ", ".join(members)
+ s = "from foo import %s" % member
self.unchanged(s)
def test_import_module_as(self):
@@ -1305,8 +1308,8 @@
def test_import_from_as(self):
for old, (new, members) in self.modules.items():
for member in members:
- b = "from %s import %s as foo_bar" % (old, ", ".join(members))
- a = "from %s import %s as foo_bar" % (new, ", ".join(members))
+ b = "from %s import %s as foo_bar" % (old, member)
+ a = "from %s import %s as foo_bar" % (new, member)
self.check(b, a)
def test_star(self):
Index: fixes/fix_imports.py
===================================================================
--- fixes/fix_imports.py (Revision 59168)
+++ fixes/fix_imports.py (Arbeitskopie)
@@ -10,9 +10,14 @@
# Local imports
from fixes import basefix
from fixes.util import Name, attr_chain, any, set
+import __builtin__
+builtin_names = [name for name in dir(__builtin__)
+ if name not in ("__name__", "__doc__")]
MAPPING = {"StringIO": ("io", ["StringIO"]),
- "cStringIO": ("io", ["StringIO"])}
+ "cStringIO": ("io", ["StringIO"]),
+ "__builtin__" : ("builtins", builtin_names),
+ }
def alternates(members):
_______________________________________________
Python-bugs-list mailing list
Unsubscribe:
http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
