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

21
Lib/lib2to3/fixes/fix_zip.py
View file

@ -9,13 +9,16 @@ iter(<>), list(<>), tuple(<>), sorted(<>), ...join(<>), or for V in <>:.
# Local imports
from .. import fixer_base
from ..fixer_util import Name, Call, in_special_context
from ..pytree import Node
from ..pygram import python_symbols as syms
from ..fixer_util import Name, ArgList, in_special_context
class FixZip(fixer_base.ConditionalFix):
BM_compatible = True
PATTERN = """
power< 'zip' args=trailer< '(' [any] ')' >
power< 'zip' args=trailer< '(' [any] ')' > [trailers=trailer*]
>
"""
@ -28,8 +31,16 @@ class FixZip(fixer_base.ConditionalFix):
if in_special_context(node):
return None
new = node.clone()
new.prefix = ""
new = Call(Name("list"), [new])
args = results['args'].clone()
args.prefix = ""
trailers = []
if 'trailers' in results:
trailers = [n.clone() for n in results['trailers']]
for n in trailers:
n.prefix = ""
new = Node(syms.power, [Name("zip"), args], prefix="")
new = Node(syms.power, [Name("list"), ArgList([new])] + trailers)
new.prefix = node.prefix
return new