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

bpo-41970: Avoid test failure in test_lib2to3 if the module is already imported #22595

Merged
merged 1 commit into from
Oct 8, 2020

Conversation

pablogsal
Copy link
Member

@pablogsal pablogsal commented Oct 8, 2020

https://bugs.python.org/issue41970

Automerge-Triggered-By: @pablogsal

@pablogsal pablogsal added the needs backport to 3.9 only security fixes label Oct 8, 2020
@pablogsal pablogsal requested a review from tirkarthi October 8, 2020 13:01
@pablogsal pablogsal self-assigned this Oct 8, 2020
@bedevere-bot bedevere-bot added tests Tests in the Lib/test dir awaiting core review labels Oct 8, 2020
@pablogsal pablogsal added 🤖 automerge and removed awaiting core review tests Tests in the Lib/test dir labels Oct 8, 2020
Copy link
Member

@tirkarthi tirkarthi left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks @pablogsal, on further thought this seems to be a better approach testing warning is raised than passing quiet=True. quiet=True won't catch even if the warning is removed though we will be removing lib2to3 in future. I tested the patch and it works fine locally.

@miss-islington miss-islington merged commit 4a9f82f into python:master Oct 8, 2020
@miss-islington
Copy link
Contributor

Thanks @pablogsal for the PR 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington
Copy link
Contributor

Sorry, @pablogsal, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 4a9f82f50d957b6cf3fd207de8b583d9137316b8 3.9

@pablogsal
Copy link
Member Author

@tirkarthi Could you do the 3.9 backport?

@tirkarthi
Copy link
Member

Sure, I will do it.

tirkarthi pushed a commit to tirkarthi/cpython that referenced this pull request Oct 9, 2020
…already imported (pythonGH-22595)

…

Automerge-Triggered-By: @pablogsal.
(cherry picked from commit 4a9f82f)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
@bedevere-bot
Copy link

GH-22609 is a backport of this pull request to the 3.9 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Oct 9, 2020
shihai1991 added a commit to shihai1991/cpython that referenced this pull request Oct 9, 2020
* origin/master: (147 commits)
  Fix the attribute names in the docstring of GenericAlias (pythonGH-22594)
  bpo-39337: Add a test case for normalizing of codec names (pythonGH-19069)
  bpo-41557: Update Windows installer to use SQLite 3.33.0 (pythonGH-21960)
  bpo-41976: Fix the fallback to gcc of ctypes.util.find_library when using gcc>9 (pythonGH-22598)
  bpo-41306: Allow scale value to not be rounded (pythonGH-21715)
  bpo-41970: Avoid test failure in test_lib2to3 if the module is already imported (pythonGH-22595)
  bpo-41376: Fix the documentation of `site.getusersitepackages()` (pythonGH-21602)
  Revert "bpo-26680: Incorporate is_integer in all built-in and standard library numeric types (pythonGH-6121)" (pythonGH-22584)
  bpo-41923: PEP 613: Add TypeAlias to typing module (python#22532)
  Fix comment about PyObject_IsTrue. (pythonGH-22343)
  bpo-38605: Make 'from __future__ import annotations' the default (pythonGH-20434)
  bpo-41905: Add abc.update_abstractmethods() (pythonGH-22485)
  bpo-41944: No longer call eval() on content received via HTTP in the UnicodeNames tests (pythonGH-22575)
  bpo-41944: No longer call eval() on content received via HTTP in the CJK codec tests (pythonGH-22566)
  Post 3.10.0a1
  Python 3.10.0a1
  bpo-41584: clarify when the reflected method of a binary arithemtic operator is called (python#22505)
  bpo-41939: Fix test_site.test_license_exists_at_url() (python#22559)
  bpo-41774: Tweak new programming FAQ entry (pythonGH-22562)
  bpo-41936. Remove macros Py_ALLOW_RECURSION/Py_END_ALLOW_RECURSION (pythonGH-22552)
  ...
pablogsal added a commit that referenced this pull request Oct 9, 2020
…already imported (GH-22595) (GH-22609)

(cherry picked from commit 4a9f82f)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
xzy3 pushed a commit to xzy3/cpython that referenced this pull request Oct 18, 2020
@pablogsal pablogsal deleted the bpo-42970 branch May 19, 2021 19:00
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.

5 participants