diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2018-07-31 06:34:30 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-31 06:34:30 (GMT) |
| commit | 4b8a7f51da224d1a0ad8159935f78ba4e6e16037 (patch) | |
| tree | d97ceaf13b603aa8960f2b4d33408ed35d30cc24 /Lib/lib2to3/fixes | |
| parent | ac20e0f98d6727ba97a9575bfa2a11b2f6247c35 (diff) | |
| download | cpython-4b8a7f51da224d1a0ad8159935f78ba4e6e16037.zip cpython-4b8a7f51da224d1a0ad8159935f78ba4e6e16037.tar.gz cpython-4b8a7f51da224d1a0ad8159935f78ba4e6e16037.tar.bz2 | |
Revert "closes bpo-27494: Fix 2to3 handling of trailing comma after a generator expression (GH-3771)" (#8241)
This reverts commit af810b35b494ef1d255d4bf340b92a9dad446995.
This is not valid syntax (see bpo-32012).
Diffstat (limited to 'Lib/lib2to3/fixes')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_dict.py | 2 | ||||
| -rw-r--r-- | Lib/lib2to3/fixes/fix_paren.py | 4 | ||||
| -rw-r--r-- | Lib/lib2to3/fixes/fix_xrange.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Lib/lib2to3/fixes/fix_dict.py b/Lib/lib2to3/fixes/fix_dict.py index 55be553..d3655c9 100644 --- a/Lib/lib2to3/fixes/fix_dict.py +++ b/Lib/lib2to3/fixes/fix_dict.py @@ -83,7 +83,7 @@ class FixDict(fixer_base.BaseFix): p1 = patcomp.compile_pattern(P1) P2 = """for_stmt< 'for' any 'in' node=any ':' any* > - | old_comp_for< 'for' any 'in' node=any any* > + | comp_for< 'for' any 'in' node=any any* > """ p2 = patcomp.compile_pattern(P2) diff --git a/Lib/lib2to3/fixes/fix_paren.py b/Lib/lib2to3/fixes/fix_paren.py index de49eef..b205aa7 100644 --- a/Lib/lib2to3/fixes/fix_paren.py +++ b/Lib/lib2to3/fixes/fix_paren.py @@ -15,7 +15,7 @@ class FixParen(fixer_base.BaseFix): PATTERN = """ atom< ('[' | '(') (listmaker< any - old_comp_for< + comp_for< 'for' NAME 'in' target=testlist_safe< any (',' any)+ [','] > @@ -24,7 +24,7 @@ class FixParen(fixer_base.BaseFix): > | testlist_gexp< any - old_comp_for< + comp_for< 'for' NAME 'in' target=testlist_safe< any (',' any)+ [','] > diff --git a/Lib/lib2to3/fixes/fix_xrange.py b/Lib/lib2to3/fixes/fix_xrange.py index f5f06f3..1e491e1 100644 --- a/Lib/lib2to3/fixes/fix_xrange.py +++ b/Lib/lib2to3/fixes/fix_xrange.py @@ -55,7 +55,7 @@ class FixXrange(fixer_base.BaseFix): p1 = patcomp.compile_pattern(P1) P2 = """for_stmt< 'for' any 'in' node=any ':' any* > - | old_comp_for< 'for' any 'in' node=any any* > + | comp_for< 'for' any 'in' node=any any* > | comparison< any 'in' node=any any*> """ p2 = patcomp.compile_pattern(P2) |