mirror of
https://github.com/python/cpython.git
synced 2025-11-03 23:21:29 +00:00
4eb5fa56e4
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r82779 | benjamin.peterson | 2010-07-10 14:45:08 -0500 (Sat, 10 Jul 2010) | 1 line typo in attribute name #9217 ........ r82855 | benjamin.peterson | 2010-07-13 16:27:38 -0500 (Tue, 13 Jul 2010) | 1 line remove more extraneous commas #9245 ........ r83740 | alexandre.vassalotti | 2010-08-05 01:58:36 -0500 (Thu, 05 Aug 2010) | 4 lines Issue 5077: Update fixer for the other functions gone from the operator module. Patch by Meador Inge. ........ r83789 | benjamin.peterson | 2010-08-07 17:45:14 -0500 (Sat, 07 Aug 2010) | 1 line cleanup and use unicode consistently ........ r83790 | benjamin.peterson | 2010-08-07 17:52:06 -0500 (Sat, 07 Aug 2010) | 1 line unicode literal ........ r83791 | benjamin.peterson | 2010-08-07 17:52:55 -0500 (Sat, 07 Aug 2010) | 1 line .get() is pointless here ........ r83797 | benjamin.peterson | 2010-08-07 18:54:51 -0500 (Sat, 07 Aug 2010) | 1 line add a function to find how a node is indented ........ r83798 | benjamin.peterson | 2010-08-07 18:55:28 -0500 (Sat, 07 Aug 2010) | 1 line when splitting import statements, use correct indentation #9386 ........ r83799 | benjamin.peterson | 2010-08-07 18:57:43 -0500 (Sat, 07 Aug 2010) | 1 line double quotes ........ r83800 | benjamin.peterson | 2010-08-07 18:58:52 -0500 (Sat, 07 Aug 2010) | 1 line add another test ........ r83801 | benjamin.peterson | 2010-08-07 19:02:10 -0500 (Sat, 07 Aug 2010) | 1 line cleanup; style-nits ........ r83803 | benjamin.peterson | 2010-08-07 19:05:08 -0500 (Sat, 07 Aug 2010) | 1 line slightly more explicit ........ r83811 | benjamin.peterson | 2010-08-07 22:56:44 -0500 (Sat, 07 Aug 2010) | 4 lines Fix node.pre_order() to call the right method on its children. This was a rather tragic copy-paste error. ........ r83827 | benjamin.peterson | 2010-08-08 08:12:48 -0500 (Sun, 08 Aug 2010) | 1 line cause test to actually run and fix it ........ r83844 | benjamin.peterson | 2010-08-08 13:46:37 -0500 (Sun, 08 Aug 2010) | 1 line fix whitespace ........
55 lines
1.9 KiB
Python
55 lines
1.9 KiB
Python
""" Fixer for imports of itertools.(imap|ifilter|izip|ifilterfalse) """
|
|
|
|
# Local imports
|
|
from lib2to3 import fixer_base
|
|
from lib2to3.fixer_util import BlankLine, syms, token
|
|
|
|
|
|
class FixItertoolsImports(fixer_base.BaseFix):
|
|
PATTERN = """
|
|
import_from< 'from' 'itertools' 'import' imports=any >
|
|
""" %(locals())
|
|
|
|
def transform(self, node, results):
|
|
imports = results['imports']
|
|
if imports.type == syms.import_as_name or not imports.children:
|
|
children = [imports]
|
|
else:
|
|
children = imports.children
|
|
for child in children[::2]:
|
|
if child.type == token.NAME:
|
|
member = child.value
|
|
name_node = child
|
|
elif child.type == token.STAR:
|
|
# Just leave the import as is.
|
|
return
|
|
else:
|
|
assert child.type == syms.import_as_name
|
|
name_node = child.children[0]
|
|
member_name = name_node.value
|
|
if member_name in ('imap', 'izip', 'ifilter'):
|
|
child.value = None
|
|
child.remove()
|
|
elif member_name == 'ifilterfalse':
|
|
node.changed()
|
|
name_node.value = 'filterfalse'
|
|
|
|
# Make sure the import statement is still sane
|
|
children = imports.children[:] or [imports]
|
|
remove_comma = True
|
|
for child in children:
|
|
if remove_comma and child.type == token.COMMA:
|
|
child.remove()
|
|
else:
|
|
remove_comma ^= True
|
|
|
|
while children and children[-1].type == token.COMMA:
|
|
children.pop().remove()
|
|
|
|
# If there are no imports left, just get rid of the entire statement
|
|
if (not (imports.children or getattr(imports, 'value', None)) or
|
|
imports.parent is None):
|
|
p = node.prefix
|
|
node = BlankLine()
|
|
node.prefix = p
|
|
return node
|