mirror of
https://github.com/python/cpython.git
synced 2025-10-31 21:51:50 +00:00
baf267ceae
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r61626 | david.wolever | 2008-03-19 17:19:16 +0100 (Mi, 19 Mär 2008) | 1 line Added fixer for implicit local imports. See #2414. ........ r61628 | david.wolever | 2008-03-19 17:57:43 +0100 (Mi, 19 Mär 2008) | 1 line Added a class for tests which should not run if a particular import is found. ........ r61629 | collin.winter | 2008-03-19 17:58:19 +0100 (Mi, 19 Mär 2008) | 1 line Two more relative import fixes in pgen2. ........ r61635 | david.wolever | 2008-03-19 20:16:03 +0100 (Mi, 19 Mär 2008) | 1 line Fixed print fixer so it will do the Right Thing when it encounters __future__.print_function. 2to3 gets upset, though, so the tests have been commented out. ........ r61637 | david.wolever | 2008-03-19 21:37:17 +0100 (Mi, 19 Mär 2008) | 3 lines Added a fixer for itertools imports (from itertools import imap, ifilterfalse --> from itertools import filterfalse) ........ r61645 | david.wolever | 2008-03-19 23:22:35 +0100 (Mi, 19 Mär 2008) | 1 line SVN is happier when you add the files you create... -_-' ........ r61654 | david.wolever | 2008-03-20 01:09:56 +0100 (Do, 20 Mär 2008) | 1 line Added an explicit sort order to fixers -- fixes problems like #2427 ........ r61664 | david.wolever | 2008-03-20 04:32:40 +0100 (Do, 20 Mär 2008) | 3 lines Fixes #2428 -- comments are no longer eatten by __future__ fixer. ........ r61673 | david.wolever | 2008-03-20 17:22:40 +0100 (Do, 20 Mär 2008) | 1 line Added 2to3 node pretty-printer ........ r61679 | david.wolever | 2008-03-20 20:50:42 +0100 (Do, 20 Mär 2008) | 1 line Made node printing a little bit prettier ........ r61723 | martin.v.loewis | 2008-03-22 00:59:27 +0100 (Sa, 22 Mär 2008) | 2 lines Fix whitespace. ........
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 basefix
|
|
from .util import Name
|
|
|
|
class FixItertools(basefix.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))
|