mirror of
https://github.com/python/cpython.git
synced 2025-10-23 23:22:11 +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.
........
................
45 lines
1.6 KiB
Python
45 lines
1.6 KiB
Python
""" Fixer for imports of itertools.(imap|ifilter|izip|ifilterfalse) """
|
|
|
|
# Local imports
|
|
from .. import fixer_base
|
|
from ..fixer_util import BlankLine
|
|
|
|
class FixItertoolsImports(fixer_base.BaseFix):
|
|
PATTERN = """
|
|
import_from< 'from' 'itertools' 'import' imports=any >
|
|
""" %(locals())
|
|
|
|
def transform(self, node, results):
|
|
imports = results['imports']
|
|
children = imports.children[:] or [imports]
|
|
for child in children:
|
|
if not hasattr(child, 'value'):
|
|
# Handle 'import ... as ...'
|
|
continue
|
|
if child.value in ('imap', 'izip', 'ifilter'):
|
|
# The value must be set to none in case child == import,
|
|
# so that the test for empty imports will work out
|
|
child.value = None
|
|
child.remove()
|
|
elif child.value == 'ifilterfalse':
|
|
node.changed()
|
|
child.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 getattr(child, 'value', None) == ',':
|
|
child.remove()
|
|
else:
|
|
remove_comma ^= True
|
|
|
|
if str(children[-1]) == ',':
|
|
children[-1].remove()
|
|
|
|
# If there are no imports left, just get rid of the entire statement
|
|
if not (imports.children or getattr(imports, 'value', None)):
|
|
p = node.get_prefix()
|
|
node = BlankLine()
|
|
node.prefix = p
|
|
return node
|