Author: Ronan Lamy <[email protected]>
Branch: stdlib-3.6.9
Changeset: r97055:6f617f012a11
Date: 2019-08-02 20:35 +0100
http://bitbucket.org/pypy/pypy/changeset/6f617f012a11/
Log: fix importlib merge
diff --git a/lib-python/3/importlib/_bootstrap.py
b/lib-python/3/importlib/_bootstrap.py
--- a/lib-python/3/importlib/_bootstrap.py
+++ b/lib-python/3/importlib/_bootstrap.py
@@ -162,16 +162,16 @@
_imp.acquire_lock()
try:
- try:
- lock = _module_locks[name]()
- except KeyError:
+ try:
+ lock = _module_locks[name]()
+ except KeyError:
lock = None
- if lock is None:
- if _thread is None:
- lock = _DummyModuleLock(name)
- else:
- lock = _ModuleLock(name)
+ if lock is None:
+ if _thread is None:
+ lock = _DummyModuleLock(name)
+ else:
+ lock = _ModuleLock(name)
def cb(ref, name=name):
_imp.acquire_lock()
@@ -180,11 +180,11 @@
# after the previous lock was destroyed
# but before the weakref callback was called.
if _module_locks.get(name) is ref:
- del _module_locks[name]
+ del _module_locks[name]
finally:
_imp.release_lock()
- _module_locks[name] = _weakref.ref(lock, cb)
+ _module_locks[name] = _weakref.ref(lock, cb)
finally:
_imp.release_lock()
@@ -968,7 +968,7 @@
with _ModuleLockManager(name):
module = sys.modules.get(name, _NEEDS_LOADING)
if module is _NEEDS_LOADING:
- return _find_and_load_unlocked(name, import_)
+ return _find_and_load_unlocked(name, import_)
if module is None:
message = ('import of {} halted; '
@@ -991,7 +991,7 @@
_sanity_check(name, package, level)
if level > 0:
name = _resolve_name(name, package, level)
- return _find_and_load(name, _gcd_import)
+ return _find_and_load(name, _gcd_import)
def _handle_fromlist(module, fromlist, import_, *, recursive=False):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
