mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 61602 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

................
  r61602 | martin.v.loewis | 2008-03-19 00:22:42 -0500 (Mi, 19 Mär 2008) | 17 lines

  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.
  ........
................
This commit is contained in:
Martin v. Löwis 2008-03-19 05:26:18 +00:00
parent ef04c44e29
commit f733c60d9a
24 changed files with 249 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/lib2to3/fixes/fix_imports.py
View file

@ -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()))