mirror of
https://github.com/python/cpython
synced 2026-09-29 12:10:30 +03:00
If a module injects something into sys.modules as a side-effect of
importation, then respect that injection. Discovered thanks to Lib/xml/parsers/expat.py injecting xml.parsers.expat.errors and etree now importing that directly as a module.
This commit is contained in:
parent
368b4b7405
commit
927d87470a
2 changed files with 16 additions and 0 deletions
|
|
@ -927,6 +927,9 @@ def _find_and_load(name, import_):
|
|||
if parent:
|
||||
if parent not in sys.modules:
|
||||
import_(parent)
|
||||
# Crazy side-effects!
|
||||
if name in sys.modules:
|
||||
return sys.modules[name]
|
||||
# Backwards-compatibility; be nicer to skip the dict lookup.
|
||||
parent_module = sys.modules[parent]
|
||||
try:
|
||||
|
|
|
|||
|
|
@ -27,6 +27,19 @@ class ParentModuleTests(unittest.TestCase):
|
|||
with self.assertRaises(ImportError):
|
||||
import_util.import_('sys.no_submodules_here')
|
||||
|
||||
def test_module_not_package_but_side_effects(self):
|
||||
# If a module injects something into sys.modules as a side-effect, then
|
||||
# pick up on that fact.
|
||||
name = 'mod'
|
||||
subname = name + '.b'
|
||||
def module_injection():
|
||||
sys.modules[subname] = 'total bunk'
|
||||
mock_modules = util.mock_modules('mod',
|
||||
module_code={'mod': module_injection})
|
||||
with mock_modules as mock:
|
||||
with util.import_state(meta_path=[mock]):
|
||||
submodule = import_util.import_(subname)
|
||||
|
||||
|
||||
def test_main():
|
||||
from test.support import run_unittest
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue