Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork32.1k
bpo-28837: Fix lib2to3 handling of map/zip/filter#24
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
… followed with a 'trailer', e.g. zip()[x]
Codecov Report@@ Coverage Diff @@## master #24 +/- ##==========================================+ Coverage 82.37% 82.37% +<.01%========================================== Files 1427 1427 Lines 350948 351009 +61 ==========================================+ Hits 289088 289144 +56- Misses 61860 61865 +5 Continue to review full report at Codecov.
|
@benjaminp: Are you the right person to ping about |
| > | ||
| | | ||
| power< | ||
| 'map' trailer< '(' [arglist=any] ')' > | ||
| 'map' args=trailer< '(' [any] ')' > |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
What's the reason for this change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
What's the reason for this change?
On line 100(below), I need to clone the argument list:
new=Node(syms.power, [Name("map"),args.clone()])
If I leave the above line unchanged, then I could have written this, instead:
new=Node(syms.power, [Name("map"),ArgList([args.clone()])])
...but there's a problem with that: It doesn't clone the( and) tokens -- it creates them from scratch. As a result, one of the tests fails, due to an unpreservedprefix before the) token:
======================================================================FAIL: test_prefix_preservation (Lib.lib2to3.tests.test_fixers.Test_map)----------------------------------------------------------------------Traceback (most recent call last): File "/Users/bergs/Documents/workspace/cpython-git/Lib/lib2to3/tests/test_fixers.py", line 3036, in test_prefix_preservation self.check(b, a) File "/Users/bergs/Documents/workspace/cpython-git/Lib/lib2to3/tests/test_fixers.py", line 3031, in check super(Test_map, self).check(b, a) File "/Users/bergs/Documents/workspace/cpython-git/Lib/lib2to3/tests/test_fixers.py", line 36, in check tree = self._check(before, after) File "/Users/bergs/Documents/workspace/cpython-git/Lib/lib2to3/tests/test_fixers.py", line 32, in _check self.assertEqual(after, str(tree))AssertionError: "x = list(map( f, 'abc' ))\n\n" != "x = list(map( f, 'abc'))\n\n"- x = list(map( f, 'abc' ))? ---+ x = list(map( f, 'abc'))Hence, I think it's best to capture and clone the wholetrailer. But if I'm missing something, please let me know.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Okay, thanks for the explanation.
Refactor into Python 3 and Python 2.7 submodules.
24: Warn for exception: move warning to ceval r=ltratt a=nanjekyejoannahThis replaces the old PR:softdevteam#12Moved the warning to ceval.I removed the three component warning because it was committed in an earlier PR here:softdevteam#14Co-authored-by: Joannah Nanjekye <jnanjeky@unb.ca>
Implemented type propagation
Uh oh!
There was an error while loading.Please reload this page.
The
2to3tool will automatically wrap calls tomap,zip, andfilterwithlist():...but the tool misses some cases, if the call is followed by a "trailer" such as
[0]:This PR augments the
lib2to3"fixers" formap,zip, andfilterto correctly handle such cases.http://bugs.python.org/issue28837