diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-03-19 05:22:42 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-03-19 05:22:42 (GMT) |
| commit | ab41b370a3eb1444b8ada38311a1bb498575a81c (patch) | |
| tree | b22e09cdf2029c150bee013d8942df92f1a22250 /Lib/lib2to3/fixes/fix_imports.py | |
| parent | aad2b61f441f4af66cb6bbdcc0d74092047816b2 (diff) | |
| download | cpython-ab41b370a3eb1444b8ada38311a1bb498575a81c.zip cpython-ab41b370a3eb1444b8ada38311a1bb498575a81c.tar.gz cpython-ab41b370a3eb1444b8ada38311a1bb498575a81c.tar.bz2 | |
Merged revisions 61598-61599,61601 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r61598 | david.wolever | 2008-03-18 23:58:33 -0500 (Di, 18 Mär 2008) | 1 line
Added fixer for zip, and refactored a bit of code in the process. Closing #2171.
........
r61599 | david.wolever | 2008-03-19 00:04:26 -0500 (Mi, 19 Mär 2008) | 3 lines
Removed a bunch of duplicate code -- it's in util now.
........
r61601 | martin.v.loewis | 2008-03-19 00:21:12 -0500 (Mi, 19 Mär 2008) | 2 lines
Fix whitespace.
........
Diffstat (limited to 'Lib/lib2to3/fixes/fix_imports.py')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_imports.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/lib2to3/fixes/fix_imports.py b/Lib/lib2to3/fixes/fix_imports.py index 1ad672b..fbdf7e4 100644 --- a/Lib/lib2to3/fixes/fix_imports.py +++ b/Lib/lib2to3/fixes/fix_imports.py @@ -16,7 +16,7 @@ builtin_names = [name for name in dir(__builtin__) MAPPING = {"StringIO": ("io", ["StringIO"]), "cStringIO": ("io", ["StringIO"]), - "__builtin__" : ("builtins", builtin_names), + "__builtin__" : ("builtins", builtin_names), } @@ -86,4 +86,4 @@ class FixImports(basefix.BaseFix): bare_name = bare_name[0] new_name = self.replace.get(bare_name.value) if new_name: - bare_name.replace(Name(new_name, prefix=bare_name.get_prefix())) + bare_name.replace(Name(new_name, prefix=bare_name.get_prefix())) |