diff options
Diffstat (limited to 'Lib/lib2to3/fixes/fix_map.py')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_map.py | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/Lib/lib2to3/fixes/fix_map.py b/Lib/lib2to3/fixes/fix_map.py index 78cf81c..7a7d0db 100644 --- a/Lib/lib2to3/fixes/fix_map.py +++ b/Lib/lib2to3/fixes/fix_map.py @@ -22,10 +22,8 @@ soon as the shortest argument is exhausted. # Local imports from ..pgen2 import token from .. import fixer_base -from ..fixer_util import Name, ArgList, Call, ListComp, in_special_context +from ..fixer_util import Name, Call, ListComp, in_special_context from ..pygram import python_symbols as syms -from ..pytree import Node - class FixMap(fixer_base.ConditionalFix): BM_compatible = True @@ -34,7 +32,6 @@ class FixMap(fixer_base.ConditionalFix): map_none=power< 'map' trailer< '(' arglist< 'None' ',' arg=any [','] > ')' > - [extra_trailers=trailer*] > | map_lambda=power< @@ -50,12 +47,10 @@ class FixMap(fixer_base.ConditionalFix): > ')' > - [extra_trailers=trailer*] > | power< - 'map' args=trailer< '(' [any] ')' > - [extra_trailers=trailer*] + 'map' trailer< '(' [arglist=any] ')' > > """ @@ -65,46 +60,32 @@ 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() - new.prefix = "" - new = Call(Name("list"), [new]) + new.prefix = u"" + new = Call(Name(u"list"), [new]) elif "map_lambda" in results: 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 "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": + 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": 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(syms.power, [Name("list"), ArgList([new])] + trailers) - new.prefix = "" - + new = node.clone() + new.prefix = u"" + new = Call(Name(u"list"), [new]) new.prefix = node.prefix return new |