mirror of
https://github.com/python/cpython.git
synced 2025-07-23 11:15:24 +00:00

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. ........ ................
82 lines
2.5 KiB
Python
82 lines
2.5 KiB
Python
# Copyright 2007 Google, Inc. All Rights Reserved.
|
|
# Licensed to PSF under a Contributor Agreement.
|
|
|
|
"""Fixer that changes map(F, ...) into list(map(F, ...)) unless there
|
|
exists a 'from future_builtins import map' statement in the top-level
|
|
namespace.
|
|
|
|
As a special case, map(None, X) is changed into list(X). (This is
|
|
necessary because the semantics are changed in this case -- the new
|
|
map(None, X) is equivalent to [(x,) for x in X].)
|
|
|
|
We avoid the transformation (except for the special case mentioned
|
|
above) if the map() call is directly contained in iter(<>), list(<>),
|
|
tuple(<>), sorted(<>), ...join(<>), or for V in <>:.
|
|
|
|
NOTE: This is still not correct if the original code was depending on
|
|
map(F, X, Y, ...) to go on until the longest argument is exhausted,
|
|
substituting None for missing values -- like zip(), it now stops as
|
|
soon as the shortest argument is exhausted.
|
|
"""
|
|
|
|
# Local imports
|
|
from ..pgen2 import token
|
|
from .. import fixer_base
|
|
from ..fixer_util import Name, Call, ListComp, in_special_context
|
|
from ..pygram import python_symbols as syms
|
|
|
|
class FixMap(fixer_base.ConditionalFix):
|
|
|
|
PATTERN = """
|
|
map_none=power<
|
|
'map'
|
|
trailer< '(' arglist< 'None' ',' arg=any [','] > ')' >
|
|
>
|
|
|
|
|
map_lambda=power<
|
|
'map'
|
|
trailer<
|
|
'('
|
|
arglist<
|
|
lambdef< 'lambda'
|
|
(fp=NAME | vfpdef< '(' fp=NAME ')'> ) ':' xp=any
|
|
>
|
|
','
|
|
it=any
|
|
>
|
|
')'
|
|
>
|
|
>
|
|
|
|
|
power<
|
|
'map'
|
|
args=trailer< '(' [any] ')' >
|
|
>
|
|
"""
|
|
|
|
skip_on = 'future_builtins.map'
|
|
|
|
def transform(self, node, results):
|
|
if self.should_skip(node):
|
|
return
|
|
|
|
if node.parent.type == syms.simple_stmt:
|
|
self.warning(node, "You should use a for loop here")
|
|
new = node.clone()
|
|
new.set_prefix("")
|
|
new = Call(Name("list"), [new])
|
|
elif "map_lambda" in results:
|
|
new = ListComp(results.get("xp").clone(),
|
|
results.get("fp").clone(),
|
|
results.get("it").clone())
|
|
else:
|
|
if "map_none" in results:
|
|
new = results["arg"].clone()
|
|
else:
|
|
if in_special_context(node):
|
|
return None
|
|
new = node.clone()
|
|
new.set_prefix("")
|
|
new = Call(Name("list"), [new])
|
|
new.set_prefix(node.get_prefix())
|
|
return new
|