mirror of
https://github.com/python/cpython.git
synced 2025-07-25 12:14:38 +00:00
f37eb3a184
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r83852 | benjamin.peterson | 2010-08-08 15:45:44 -0500 (Sun, 08 Aug 2010) | 1 line wrap with parens ........ r83853 | benjamin.peterson | 2010-08-08 15:46:31 -0500 (Sun, 08 Aug 2010) | 1 line use parens ........ r83857 | benjamin.peterson | 2010-08-08 15:59:49 -0500 (Sun, 08 Aug 2010) | 1 line things which use touch_import should be pre order ........ r84042 | george.boutsioukis | 2010-08-14 16:10:19 -0500 (Sat, 14 Aug 2010) | 2 lines This revision incorporates into the 2to3 tool the new, faster, tree matching algorithm developed during a GSOC project. The algorithm resides in the two added modules, btm_matcher and btm_utils. New code has been added to drive the new matching process in refactor.py and a few minor changes were made in other modules. A BM_compatible flag(False by default) has been added in fixer_base and it is set to True in most of the current fixers. ........ r84216 | benjamin.peterson | 2010-08-19 16:44:05 -0500 (Thu, 19 Aug 2010) | 1 line allow star_expr in testlist_gexp ........ r84274 | benjamin.peterson | 2010-08-22 18:40:46 -0500 (Sun, 22 Aug 2010) | 1 line wrap long line ........ r84275 | benjamin.peterson | 2010-08-22 18:42:22 -0500 (Sun, 22 Aug 2010) | 1 line cleanup ........ r84276 | benjamin.peterson | 2010-08-22 18:51:01 -0500 (Sun, 22 Aug 2010) | 1 line when there's a None value and a traceback, don't call type with it #9661 ........ r84375 | george.boutsioukis | 2010-08-31 08:38:53 -0500 (Tue, 31 Aug 2010) | 3 lines Idiomatic code changes & stylistic issues fixed in the BottomMatcher module. Thanks to Benjamin Peterson for taking the time to review the code. ........ r85388 | benjamin.peterson | 2010-10-12 17:27:44 -0500 (Tue, 12 Oct 2010) | 1 line fix urllib fixer with multiple as imports on a line #10069 ........ r85478 | benjamin.peterson | 2010-10-14 08:09:56 -0500 (Thu, 14 Oct 2010) | 1 line stop abusing docstrings ........ r85506 | benjamin.peterson | 2010-10-14 17:45:19 -0500 (Thu, 14 Oct 2010) | 1 line kill sibling import ........ r85507 | benjamin.peterson | 2010-10-14 17:54:15 -0500 (Thu, 14 Oct 2010) | 1 line remove trailing whitespace ........ r85508 | benjamin.peterson | 2010-10-14 17:55:28 -0500 (Thu, 14 Oct 2010) | 1 line typo ........
42 lines
1.5 KiB
Python
42 lines
1.5 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):
|
|
BM_compatible = True
|
|
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.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.prefix
|
|
func.replace(Name(func.value[1:], prefix=prefix))
|