Skip to content
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

[3.8] bpo-39033: Fix NameError in zipimport during hash validation (GH-17588) #17642

Merged
merged 2 commits into from
Jan 14, 2020

Conversation

tirkarthi
Copy link
Member

@tirkarthi tirkarthi commented Dec 17, 2019

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

(cherry picked from commit 79f02fe)

https://bugs.python.org/issue39033

Automerge-Triggered-By: @encukou

@tirkarthi
Copy link
Member Author

Attaching steps I followed to create the backport. Verified that reverting to older importlib file causes NameError in test as expected.

$ git checkout -b backport-79f02fe-3.8 upstream/3.8
$ git cherry-pick -x 79f02fee1a542c440fd906fd54154c73fc0f8235
$ git checkout HEAD Python/importlib_zipimport.h # Revert to HEAD and regenerate file to avoid conflicts.
$ make regen-importlib
$ git add -u .
$ git cherry-pick --continue

Misc/ACKS Outdated
@@ -1886,3 +1886,4 @@ Aleksandr Balezin
Robert Leenders
Ngalim Siregar
Tim Gates
Karthikeyan Singaravelan
Copy link
Member

Choose a reason for hiding this comment

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

You are already in the list.

Copy link
Member Author

Choose a reason for hiding this comment

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

It was a result of the cherry pick. I will remove it here for conflicts with other PR sorting results. Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants