Skip to content

/ cpython

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpo-39033: Fix NameError in zipimport during hash validation #17588

Merged
merged 2 commits into from Dec 15, 2019
Merged

bpo-39033: Fix NameError in zipimport during hash validation #17588

merged 2 commits into from Dec 15, 2019
+286 −269

Conversation

@tirkarthi
Copy link
Contributor

tirkarthi commented Dec 13, 2019 •
edited by bedevere-bot

Fix NameError in zipimport during hash validation and add a regression test.

https://bugs.python.org/issue39033
tirkarthi added 2 commits Dec 13, 2019
@tirkarthi
Fix NameError in zipimport during hash validation.
84e28b1
@tirkarthi
Add myself to ACKS
Loading status checks…
8216391
@corona10
corona10 approved these changes Dec 13, 2019
View changes
Copy link
Member

corona10 left a comment

Nice catch from the issuer :)

Looks good to me!
@ncoghlan
ncoghlan approved these changes Dec 15, 2019
View changes
Copy link
Contributor

ncoghlan left a comment

Nice catch! At some point we should probably just search the entire code base for references to "boostrap"...
@ncoghlan ncoghlan merged commit 79f02fe into python:master Dec 15, 2019
4 checks passed
4 checks passed
Azure Pipelines PR #20191213.7 succeeded
Details
bedevere/issue-number Issue number 39033 found
Details
bedevere/news News entry found in Misc/NEWS.d
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@tirkarthi

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

tirkarthi commented Dec 16, 2019

Thanks Nick. I think this can be backported to 3.8 too. This changes the importlib header file and I guess it's allowed to change between bug fix versions.
@brettcannon

This comment has been minimized.

Sign in to view
Copy link
Member

brettcannon commented Dec 16, 2019

@tirkarthi yes, the header files can change in bugfix releases. But it does mean backporting will have to be done in manual PRs to get the right bytecode.
@tirkarthi

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

tirkarthi commented Dec 17, 2019

Ah yes, thanks Brett I will make a manual backport with the generated header file.
tirkarthi added a commit to tirkarthi/cpython that referenced this pull request Dec 17, 2019
@tirkarthi
bpo-39033: Fix NameError in zipimport during hash validation (pythonG…
05a9fa9 
…H-17588)

Patch by Karthikeyan Singaravelan.

(cherry picked from commit 79f02fe)
tirkarthi added a commit to tirkarthi/cpython that referenced this pull request Dec 23, 2019
@tirkarthi
bpo-39033: Fix NameError in zipimport during hash validation (pythonG…
ac000a1 
…H-17588)

Patch by Karthikeyan Singaravelan.

(cherry picked from commit 79f02fe)
miss-islington added a commit that referenced this pull request Jan 14, 2020
@tirkarthi @miss-islington
[3.8] bpo-39033: Fix NameError in zipimport during hash validation (G…
Loading status checks…
9955f33 
…H-17588) (GH-17642)

Fix `NameError` in `zipimport` during hash validation and add a regression test.

(cherry picked from commit 79f02fe)



https://bugs.python.org/issue39033
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncoghlan ncoghlan

@corona10 corona10

@brettcannon brettcannon

@warsaw warsaw

@encukou encukou

@ericsnowcurrently ericsnowcurrently

Assignees
No one assigned
Labels
CLA signed
Projects
None yet
Milestone
No milestone
6 participants
@tirkarthi @brettcannon @ncoghlan @corona10 @the-knights-who-say-ni @bedevere-bot
You can’t perform that action at this time.