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

miss-islington merged 2 commits into python:3.8 from tirkarthi:backport-79f02fe-3.8

Jan 14, 2020

+287 −272

Contributor

tirkarthi commented Dec 17, 2019 •

edited by miss-islington

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 requested review from brettcannon, encukou, ericsnowcurrently, ncoghlan and warsaw as code owners

the-knights-who-say-ni added the CLA signed label

bedevere-bot added the awaiting review label

Contributor Author

tirkarthi commented Dec 17, 2019

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

serhiy-storchaka reviewed

Misc/ACKS Outdated

  
      @@ -1886,3 +1886,4 @@ Aleksandr Balezin
    
        Robert Leenders

        Ngalim Siregar

        Tim Gates

        Karthikeyan Singaravelan

serhiy-storchaka Dec 21, 2019

Member

You are already in the list.

tirkarthi Dec 21, 2019

Author Contributor

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

tirkarthi added 2 commits


        bpo-39033: Fix NameError in zipimport during hash validation (GH-17588)

ac000a1

Patch by Karthikeyan Singaravelan.

(cherry picked from commit 79f02fe)


        Remove name from ACKS

a0e640b

tirkarthi force-pushed the tirkarthi:backport-79f02fe-3.8 branch from 05a9fa9 to a0e640b

brettcannon added awaiting core review and removed awaiting review labels

brettcannon approved these changes

bedevere-bot added awaiting merge and removed awaiting core review labels

encukou added the 🤖 automerge label

miss-islington merged commit 9955f33 into python:3.8

5 checks passed

5 checks passed

Azure Pipelines PR #20191223.12 succeeded

Details

bedevere/issue-number Issue number 39033 found

Details

bedevere/maintenance-branch-pr Valid maintenance branch PR title.

bedevere/news News entry found in Misc/NEWS.d

continuous-integration/travis-ci/pr The Travis CI build passed

Details

bedevere-bot removed the awaiting merge label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

You can’t perform that action at this time.