mirror of
https://github.com/python/cpython.git
synced 2025-07-30 22:54:16 +00:00
df6dc8f107
svn+ssh://pythondev@svn.python.org/python/trunk
................
r64286 | benjamin.peterson | 2008-06-14 21:31:05 -0500 (Sat, 14 Jun 2008) | 49 lines
Merged revisions 63661,63666,63695,63711,63729,63769,63790,63880,63886 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r63661 | georg.brandl | 2008-05-26 05:26:20 -0500 (Mon, 26 May 2008) | 2 lines
Add import fixes for dbm package.
........
r63666 | georg.brandl | 2008-05-26 05:49:09 -0500 (Mon, 26 May 2008) | 2 lines
Add xmlrpc package fixes.
........
r63695 | georg.brandl | 2008-05-26 10:14:33 -0500 (Mon, 26 May 2008) | 2 lines
Add fixer entries for http package.
........
r63711 | benjamin.peterson | 2008-05-26 13:43:51 -0500 (Mon, 26 May 2008) | 2 lines
add import mapping for test.test_support -> test.support
........
r63729 | benjamin.peterson | 2008-05-26 16:31:03 -0500 (Mon, 26 May 2008) | 2 lines
mapping for commands module -> subprocess
........
r63769 | brett.cannon | 2008-05-29 00:13:13 -0500 (Thu, 29 May 2008) | 1 line
Fixer for UserString.UserString over to the collections module.
........
r63790 | brett.cannon | 2008-05-29 14:13:51 -0500 (Thu, 29 May 2008) | 4 lines
Add a fixer for UserList.
Closes issue #2878. Thanks to Quentin Gallet-Gilles for the patch.
........
r63880 | collin.winter | 2008-06-01 18:09:38 -0500 (Sun, 01 Jun 2008) | 6 lines
Move lib2to3/fixes/{basefix,util}.py down to lib2to3/.
This is step 1 of turning lib2to3/ into a general-purpose refactoring
library, reusable by other projects.
........
r63886 | collin.winter | 2008-06-01 22:15:01 -0500 (Sun, 01 Jun 2008) | 5 lines
Allow refactoring tools to specify a directory for fixer modules.
This is step 2 of turning lib2to3/ into a general-purpose refactoring
library, reusable by other projects. Step 1: r63880.
........
................
41 lines
1.4 KiB
Python
41 lines
1.4 KiB
Python
""" Fixer for itertools.(imap|ifilter|izip) --> (map|filter|zip) and
|
|
itertools.ifilterfalse --> itertools.filterfalse (bugs 2360-2363)
|
|
|
|
imports from itertools are fixed in fix_itertools_import.py
|
|
|
|
If itertools is imported as something else (ie: import itertools as it;
|
|
it.izip(spam, eggs)) method calls will not get fixed.
|
|
"""
|
|
|
|
# Local imports
|
|
from .. import fixer_base
|
|
from ..fixer_util import Name
|
|
|
|
class FixItertools(fixer_base.BaseFix):
|
|
it_funcs = "('imap'|'ifilter'|'izip'|'ifilterfalse')"
|
|
PATTERN = """
|
|
power< it='itertools'
|
|
trailer<
|
|
dot='.' func=%(it_funcs)s > trailer< '(' [any] ')' > >
|
|
|
|
|
power< func=%(it_funcs)s trailer< '(' [any] ')' > >
|
|
""" %(locals())
|
|
|
|
# Needs to be run after fix_(map|zip|filter)
|
|
run_order = 6
|
|
|
|
def transform(self, node, results):
|
|
prefix = None
|
|
func = results['func'][0]
|
|
if 'it' in results and func.value != 'ifilterfalse':
|
|
dot, it = (results['dot'], results['it'])
|
|
# Remove the 'itertools'
|
|
prefix = it.get_prefix()
|
|
it.remove()
|
|
# Replace the node wich contains ('.', 'function') with the
|
|
# function (to be consistant with the second part of the pattern)
|
|
dot.remove()
|
|
func.parent.replace(func)
|
|
|
|
prefix = prefix or func.get_prefix()
|
|
func.replace(Name(func.value[1:], prefix=prefix))
|