← 返回首页
bpo-28837: Fix lib2to3 handling of map/zip/filter by stuarteberg · Pull Request #24 · python/cpython · GitHub
Skip to content

Navigation Menu

Toggle navigation
Sign in
Appearance settings
Search or jump to...

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted
Cancel Submit feedback

Saved searches

Use saved searches to filter your results more quickly

Cancel Create saved search
Appearance settings
Resetting focus

bpo-28837: Fix lib2to3 handling of map/zip/filter#24

Merged
benjaminp merged 1 commit into
python:masterfrom
stuarteberg:patch-lib2to3-zip-map-filter
Apr 6, 2017
Merged

bpo-28837: Fix lib2to3 handling of map/zip/filter#24
benjaminp merged 1 commit into
python:masterfrom
stuarteberg:patch-lib2to3-zip-map-filter

Conversation

stuarteberg commented Feb 11, 2017 •
edited
Loading

Copy link
Copy Markdown
Contributor

The 2to3 tool will automatically wrap calls to map, zip, and filter with list():

# Original: zip('abc', '123') # After 2to3: list(zip('abc', '123'))

...but the tool misses some cases, if the call is followed by a "trailer" such as [0]:

# Skipped by 2to3: zip('abc', '123')[0]

This PR augments the lib2to3 "fixers" for map, zip, and filter to correctly handle such cases.

http://bugs.python.org/issue28837

codecov Bot commented Feb 11, 2017

Copy link
Copy Markdown

Codecov Report

Merging #24 into master will increase coverage by <.01%.

@@ 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.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e7ffb99...5cdd2db. Read the comment docs.

stuarteberg commented Feb 15, 2017

Copy link
Copy Markdown
Contributor Author

@benjaminp: Are you the right person to ping about lib2to3 PRs?

rhettinger requested a review from benjaminp April 5, 2017 05:48
benjaminp reviewed Apr 5, 2017
View reviewed changes
Comment thread Lib/lib2to3/fixes/fix_map.py
|
power<
'map' trailer< '(' [arglist=any] ')' >
'map' args=trailer< '(' [any] ')' >

benjaminp Apr 5, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

What's the reason for this change?

stuarteberg Apr 5, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

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 unpreserved prefix 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 whole trailer. But if I'm missing something, please let me know.

benjaminp Apr 6, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

Okay, thanks for the explanation.

benjaminp merged commit 93b4b47 into python:master Apr 6, 2017
Mariatta referenced this pull request in Mariatta/cpython Jun 16, 2017
[3.6] bpo-28837: Fix lib2to3 handling of map/zip/filter calls when fo… …
bac6964
…llowed with a 'trailer', e.g. zip()[x] (GH-24) (cherry picked from commit 93b4b47)
Mariatta mentioned this pull request Jun 16, 2017
Merged
Mariatta added a commit that referenced this pull request Jun 16, 2017
bpo-28837: Fix lib2to3 handling of map/zip/filter calls when followed… …
292b421
… with a 'trailer', e.g. zip()[x] (GH-24) (GH-2235) (cherry picked from commit 93b4b47)
pablogsal mentioned this pull request Jun 12, 2020
Closed
itachaaa mentioned this pull request Aug 22, 2022
Open
mdboom mentioned this pull request Aug 25, 2022
Closed
mdboom mentioned this pull request Nov 22, 2022
Closed
ziegenbalg mentioned this pull request Nov 30, 2022
Closed
jaraco pushed a commit that referenced this pull request Dec 2, 2022
Delete a branch when PR is closed. (GH-24)
1f08664
jaraco pushed a commit to jaraco/cpython that referenced this pull request Feb 17, 2023
Support Python 2.7 (python#24) …
64a9e9f
Refactor into Python 3 and Python 2.7 submodules.
nanjekyejoannah added a commit to nanjekyejoannah/cpython that referenced this pull request Mar 10, 2023
Merge python#24 …
1f12b38
24: Warn for exception: move warning to ceval r=ltratt a=nanjekyejoannah This replaces the old PR: softdevteam#12 Moved the warning to ceval. I removed the three component warning because it was committed in an earlier PR here: softdevteam#14 Co-authored-by: Joannah Nanjekye <jnanjeky@unb.ca>
Fidget-Spinner referenced this pull request in pylbbv/pylbbv May 27, 2023
Merge pull request #24 from JuliaPoo/types_metainterpreter …
eeaa02f
Implemented type propagation
oraluben pushed a commit to oraluben/cpython that referenced this pull request Jun 25, 2023
fix: bb_test_pop_if_false not setting flag (python#24)
7cab316
gvanrossum mentioned this pull request Aug 22, 2023
Closed
LinanV mentioned this pull request Oct 23, 2023
Closed
stasos24 mentioned this pull request Oct 24, 2023
Closed
williamhu020 mentioned this pull request Nov 5, 2023
Closed
kcatss mentioned this pull request Nov 15, 2023
Closed
kcatss mentioned this pull request Jan 14, 2024
Closed
kcatss mentioned this pull request Feb 12, 2024
Closed
kcatss mentioned this pull request Feb 20, 2024
Closed
ngoldbaum mentioned this pull request Sep 23, 2024
Closed
Dean6767 mentioned this pull request Feb 10, 2025
Closed
This was referenced Feb 11, 2025
Closed
Closed
DominiquePACCO mentioned this pull request Jun 3, 2025
Closed
efimov-mikhail mentioned this pull request Nov 5, 2025
Open
StanFromIreland referenced this pull request in StanFromIreland/cpython Dec 6, 2025
Merge pull request #24 from StanFromIreland/lazy-color
4cd4322
sergey-miryanov mentioned this pull request Dec 18, 2025
Closed
Qanux mentioned this pull request Feb 11, 2026
Closed
ngoldbaum mentioned this pull request Mar 6, 2026
Open
Eclips4 pushed a commit to Eclips4/cpython that referenced this pull request Mar 10, 2026
Implement the Unix build system refactor (python#24) …
95753bb
This PR pretty much completely refactors the Rust build system. There are now two main ways Rust code is built: # both - The Rust triple is deduced based on the preprocessor run on Misc/platform_triplet.c - A cpython-build-helper crate is used to pass the proper link arguments for each configuration - The proper Rust toolchain is downloaded for iOS/Android/WASI for CI on those platforms - cpython-sys is updated significantly to ensure bindgen properly generates the bindings for each platform # shared For shared builds, we build a crate into a cdylib and pass through link arguments from the makefile/configure and the linker executable so that the final link will match what is done for C programs. # static For static builds, a cpython-rust-staticlib crate is a built which depends on and re-exports the module initializers for each crate. This ensures there aren't duplicated Rust stdlib/core symbols. Fixes python#23
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

benjaminp benjaminp left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

Footer

© 2026 GitHub, Inc.