[Python-3000-checkins] r65704 - in python/branches/py3k: Lib/lib2to3 Lib/lib2to3/fixes/fix_imports.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Aug 16 01:56:02 2008
New Revision: 65704

Log:
Merged revisions 65703 via svnmerge from
svn+ssh://pythondev at svn.python.org/python/trunk

................
r65703 | benjamin.peterson | 2008-08-15 18:51:24 -0500 (Fri, 15 Aug 2008) | 11 lines

Merged revisions 65397 via svnmerge from
svn+ssh://pythondev at svn.python.org/sandbox/trunk/2to3/lib2to3

........
r65397 | collin.winter | 2008-08-01 22:39:06 -0500 (Fri, 01 Aug 2008) | 5 lines

Patch #3480 by Nick Edds.

Dramatically simplifies the fix_imports pattern, resulting in a reduction of the test_all_fixers runtime from 122+ secs to 59 secs (a good predictor of 2to3 performance).
........
................


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/lib2to3/ (props changed)
python/branches/py3k/Lib/lib2to3/fixes/fix_imports.py

Modified: python/branches/py3k/Lib/lib2to3/fixes/fix_imports.py
==============================================================================
--- python/branches/py3k/Lib/lib2to3/fixes/fix_imports.py (original)
+++ python/branches/py3k/Lib/lib2to3/fixes/fix_imports.py Sat Aug 16 01:56:02 2008
@@ -61,24 +61,23 @@


def build_pattern(mapping=MAPPING):
- bare = set()
- for old_module, new_module in mapping.items():
- bare.add(old_module)
- yield """import_name< 'import' (module=%r
- | dotted_as_names< any* module=%r any* >) >
- """ % (old_module, old_module)
- yield """import_from< 'from' module_name=%r 'import'
- ( any | import_as_name< any 'as' any > |
- import_as_names< any* >) >
- """ % old_module
- yield """import_name< 'import'
- dotted_as_name< module_name=%r 'as' any > >
- """ % old_module
- # Find usages of module members in code e.g. urllib.foo(bar)
- yield """power< module_name=%r
- trailer<'.' any > any* >
- """ % old_module
- yield """bare_name=%s""" % alternates(bare)
+ mod_list = ' | '.join(["module='" + key + "'" for key in mapping.keys()])
+ mod_name_list = ' | '.join(["module_name='" + key + "'" for key in mapping.keys()])
+ yield """import_name< 'import' ((%s)
+ | dotted_as_names< any* (%s) any* >) >
+ """ % (mod_list, mod_list)
+ yield """import_from< 'from' (%s) 'import'
+ ( any | import_as_name< any 'as' any > |
+ import_as_names< any* >) >
+ """ % mod_name_list
+ yield """import_name< 'import'
+ dotted_as_name< (%s) 'as' any > >
+ """ % mod_name_list
+ # Find usages of module members in code e.g. urllib.foo(bar)
+ yield """power< (%s)
+ trailer<'.' any > any* >
+ """ % mod_name_list
+ yield """bare_name=%s""" % alternates(mapping.keys())

class FixImports(fixer_base.BaseFix):
PATTERN = "|".join(build_pattern())