bpo-40050: Fix importlib._bootstrap_external #19135

vstinner · 2020-03-24T15:19:33Z

Remove two unused imports: _thread and _weakref. Avoid creating a new
winreg builtin module if it's already available in sys.modules.

The winreg module is now stored as "winreg" rather than "_winreg".

https://bugs.python.org/issue40050

vstinner · 2020-03-24T15:23:46Z

I tested manually that test_importlib no longer leaks with this PR if I reapply commit 8334f30:

$ ./python -m test -R 3:3 test_importlib 
(...)
beginning 6 repetitions
123456
......
(...)
Tests result: SUCCESS

$ git log

commit b7acc84ec0ba3dd092b0a5f879559fc1df0b5d7b (HEAD -> importlib_builtins)
Author: Hai Shi <shihai1992@gmail.com>
Date:   Fri Mar 20 16:16:45 2020 +0800

    [bpo-1635741](https://bugs.python.org/issue1635741): Port _weakref extension module to multiphase initialization (PEP 489) (GH-19084)

commit ee7422bfa01164e4077140333eabe663b6aab5e9 (origin/importlib_builtins)
Author: Victor Stinner <vstinner@python.org>
Date:   Tue Mar 24 15:54:39 2020 +0100

    [bpo-40050](https://bugs.python.org/issue40050): Fix importlib._bootstrap_external
    
    Remove two unused imports: _thread and _weakref. Avoid creating a new
    winreg builtin module if it's already available in sys.modules.
    
    The winreg module is now stored as "winreg" rather than "_winreg".

(...)

Lib/importlib/_bootstrap_external.py

Remove two unused imports: _thread and _weakref. Avoid creating a new winreg builtin module if it's already available in sys.modules. The winreg module is now stored as "winreg" rather than "_winreg".

Misc/NEWS.d/next/Library/2020-03-24-16-17-20.bpo-40050.6GrOlz.rst

Remove two unused imports: _thread and _weakref. Avoid creating a new winreg builtin module if it's already available in sys.modules. The winreg module is now stored as "winreg" rather than "_winreg".

the-knights-who-say-ni added the CLA signed label Mar 24, 2020

bedevere-bot added the awaiting core review label Mar 24, 2020

vstinner force-pushed the importlib_builtins branch from efcffe9 to 832e7ca Compare Mar 24, 2020

corona10 reviewed Mar 24, 2020

View changes

Lib/importlib/_bootstrap_external.py Outdated Show resolved Hide resolved

bpo-40050: Fix importlib._bootstrap_external

6cc525e

Remove two unused imports: _thread and _weakref. Avoid creating a new winreg builtin module if it's already available in sys.modules. The winreg module is now stored as "winreg" rather than "_winreg".

vstinner force-pushed the importlib_builtins branch from 832e7ca to 6cc525e Compare Mar 24, 2020

corona10 approved these changes Mar 24, 2020

View changes

vstinner merged commit 83d46e0 into python:master Mar 24, 2020
9 checks passed

bedevere-bot removed the awaiting core review label Mar 24, 2020

vstinner deleted the importlib_builtins branch Mar 24, 2020

brettcannon reviewed Mar 24, 2020

View changes

Misc/NEWS.d/next/Library/2020-03-24-16-17-20.bpo-40050.6GrOlz.rst Show resolved Hide resolved

python / cpython Public

bpo-40050: Fix importlib._bootstrap_external #19135

bpo-40050: Fix importlib._bootstrap_external #19135

vstinner commented Mar 24, 2020 •

edited by bedevere-bot

vstinner commented Mar 24, 2020 •

edited by bedevere-bot

python / cpython Public

bpo-40050: Fix importlib._bootstrap_external #19135

bpo-40050: Fix importlib._bootstrap_external #19135

Conversation

vstinner commented Mar 24, 2020 • edited by bedevere-bot

vstinner commented Mar 24, 2020 • edited by bedevere-bot

vstinner commented Mar 24, 2020 •

edited by bedevere-bot

vstinner commented Mar 24, 2020 •

edited by bedevere-bot