mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-28837: Fix lib2to3 handling of map/zip/filter calls when followed with a 'trailer', e.g. zip()[x] (#24)

Browse source
This commit is contained in:
Stuart Berg 2017-04-06 01:19:40 -04:00 • committed by Benjamin Peterson
parent 01fa9ae546
commit 93b4b47e3a
5 changed files with 110 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Lib/lib2to3/fixes/fix_map.py
View file

@ -22,8 +22,10 @@ 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 ..fixer_util import Name, ArgList, Call, ListComp, in_special_context
from ..pygram import python_symbols as syms
from ..pytree import Node
class FixMap(fixer_base.ConditionalFix):
BM_compatible = True
@ -32,6 +34,7 @@ class FixMap(fixer_base.ConditionalFix):
map_none=power<
'map'
trailer< '(' arglist< 'None' ',' arg=any [','] > ')' >
[extra_trailers=trailer*]
>
|
map_lambda=power<
@ -47,10 +50,12 @@ class FixMap(fixer_base.ConditionalFix):
>
')'
>
[extra_trailers=trailer*]
>
|
power<
'map' trailer< '(' [arglist=any] ')' >
'map' args=trailer< '(' [any] ')' >
[extra_trailers=trailer*]
>
"""
@ -60,6 +65,11 @@ class FixMap(fixer_base.ConditionalFix):
if self.should_skip(node):
return
trailers = []
if 'extra_trailers' in results:
for t in results['extra_trailers']:
trailers.append(t.clone())
if node.parent.type == syms.simple_stmt:
self.warning(node, "You should use a for loop here")
new = node.clone()
@ -69,23 +79,32 @@ class FixMap(fixer_base.ConditionalFix):
new = ListComp(results["xp"].clone(),
results["fp"].clone(),
results["it"].clone())
new = Node(syms.power, [new] + trailers, prefix="")
else:
if "map_none" in results:
new = results["arg"].clone()
new.prefix = ""
else:
if "arglist" in results:
args = results["arglist"]
if args.type == syms.arglist and \
args.children[0].type == token.NAME and \
args.children[0].value == "None":
if "args" in results:
args = results["args"]
if args.type == syms.trailer and \
args.children[1].type == syms.arglist and \
args.children[1].children[0].type == token.NAME and \
args.children[1].children[0].value == "None":
self.warning(node, "cannot convert map(None, ...) "
"with multiple arguments because map() "
"now truncates to the shortest sequence")
return
new = Node(syms.power, [Name("map"), args.clone()])
new.prefix = ""
if in_special_context(node):
return None
new = node.clone()
new = Node(syms.power, [Name("list"), ArgList([new])] + trailers)
new.prefix = ""
new = Call(Name("list"), [new])
new.prefix = node.prefix
return new