diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-11-29 15:58:43 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-11-29 15:58:43 (GMT) |
| commit | 4089eec0988f4ca19f8bb67398966df33b6b92d1 (patch) | |
| tree | 91782f35cd0cd3c4a6b1966c45aa790763eb0e87 /Lib/lib2to3 | |
| parent | 1d1210ec3b28827150d081d00ae7c545a2cef8c0 (diff) | |
| parent | daf28293e1a422efa222a493b378b4614e7c5512 (diff) | |
| download | cpython-4089eec0988f4ca19f8bb67398966df33b6b92d1.zip cpython-4089eec0988f4ca19f8bb67398966df33b6b92d1.tar.gz cpython-4089eec0988f4ca19f8bb67398966df33b6b92d1.tar.bz2 | |
merge 3.3 (#16573)
Diffstat (limited to 'Lib/lib2to3')
| -rw-r--r-- | Lib/lib2to3/fixer_util.py | 12 | ||||
| -rw-r--r-- | Lib/lib2to3/tests/test_fixers.py | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/Lib/lib2to3/fixer_util.py b/Lib/lib2to3/fixer_util.py index 2b5bb1d..60d219f 100644 --- a/Lib/lib2to3/fixer_util.py +++ b/Lib/lib2to3/fixer_util.py @@ -165,7 +165,7 @@ def parenthesize(node): consuming_calls = set(["sorted", "list", "set", "any", "all", "tuple", "sum", - "min", "max"]) + "min", "max", "enumerate"]) def attr_chain(obj, attr): """Follow an attribute chain. @@ -192,14 +192,14 @@ p0 = """for_stmt< 'for' any 'in' node=any ':' any* > p1 = """ power< ( 'iter' | 'list' | 'tuple' | 'sorted' | 'set' | 'sum' | - 'any' | 'all' | (any* trailer< '.' 'join' >) ) + 'any' | 'all' | 'enumerate' | (any* trailer< '.' 'join' >) ) trailer< '(' node=any ')' > any* > """ p2 = """ power< - 'sorted' + ( 'sorted' | 'enumerate' ) trailer< '(' arglist<node=any any*> ')' > any* > @@ -207,14 +207,14 @@ power< pats_built = False def in_special_context(node): """ Returns true if node is in an environment where all that is required - of it is being itterable (ie, it doesn't matter if it returns a list - or an itterator). + of it is being iterable (ie, it doesn't matter if it returns a list + or an iterator). See test_map_nochange in test_fixers.py for some examples and tests. """ global p0, p1, p2, pats_built if not pats_built: - p1 = patcomp.compile_pattern(p1) p0 = patcomp.compile_pattern(p0) + p1 = patcomp.compile_pattern(p1) p2 = patcomp.compile_pattern(p2) pats_built = True patterns = [p0, p1, p2] diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py index 43184e1..914b3bf 100644 --- a/Lib/lib2to3/tests/test_fixers.py +++ b/Lib/lib2to3/tests/test_fixers.py @@ -2981,6 +2981,10 @@ class Test_filter(FixerTestCase): self.unchanged(a) a = """sorted(filter(f, 'abc'), key=blah)[0]""" self.unchanged(a) + a = """enumerate(filter(f, 'abc'))""" + self.unchanged(a) + a = """enumerate(filter(f, 'abc'), start=1)""" + self.unchanged(a) a = """for i in filter(f, 'abc'): pass""" self.unchanged(a) a = """[x for x in filter(f, 'abc')]""" @@ -3089,6 +3093,10 @@ class Test_map(FixerTestCase): self.unchanged(a) a = """sorted(map(f, 'abc'), key=blah)[0]""" self.unchanged(a) + a = """enumerate(map(f, 'abc'))""" + self.unchanged(a) + a = """enumerate(map(f, 'abc'), start=1)""" + self.unchanged(a) a = """for i in map(f, 'abc'): pass""" self.unchanged(a) a = """[x for x in map(f, 'abc')]""" @@ -3152,6 +3160,10 @@ class Test_zip(FixerTestCase): self.unchanged(a) a = """sorted(zip(a, b), key=blah)[0]""" self.unchanged(a) + a = """enumerate(zip(a, b))""" + self.unchanged(a) + a = """enumerate(zip(a, b), start=1)""" + self.unchanged(a) a = """for i in zip(a, b): pass""" self.unchanged(a) a = """[x for x in zip(a, b)]""" |