Skip to content

Fix failed merge of bpo-43288. #24614

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

Merged
merged 1 commit into from
Feb 21, 2021
Merged

Conversation

nascheme
Copy link
Member

@nascheme nascheme commented Feb 21, 2021

Github rebase put the skip() method in the wrong place. Fix it.

https://bugs.python.org/issue43288

@nascheme nascheme added tests Tests in the Lib/test dir skip issue skip news needs backport to 3.9 only security fixes labels Feb 21, 2021
@nascheme nascheme merged commit 84f7afe into python:master Feb 21, 2021
@miss-islington
Copy link
Contributor

Thanks @nascheme for the PR 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @nascheme, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 84f7afe65c29330f3ff8e318e054b96554a2dede 3.9

nascheme added a commit that referenced this pull request Feb 21, 2021
nascheme added a commit that referenced this pull request Feb 21, 2021
* bpo-43288: Fix bug in test_importlib test. (GH-24612)
* Fix failed merge of bpo-43288. (GH-24614)
adorilson pushed a commit to adorilson/cpython that referenced this pull request Mar 13, 2021
@terryjreedy terryjreedy removed the needs backport to 3.9 only security fixes label Feb 18, 2025
@terryjreedy
Copy link
Member

The backport attempt was a mistake because the original PR that this fixes was never merged into 3.9.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip issue skip news tests Tests in the Lib/test dir
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants