Issue #21200: Return None from pkgutil.get_loader() when __spec__ is missing.
This commit is contained in:
parent
bddecc3861
commit
658af31372
|
@ -461,6 +461,8 @@ def get_loader(module_or_name):
|
|||
loader = getattr(module, '__loader__', None)
|
||||
if loader is not None:
|
||||
return loader
|
||||
if getattr(module, '__spec__', None) is None:
|
||||
return None
|
||||
fullname = module.__name__
|
||||
else:
|
||||
fullname = module_or_name
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from test.support import run_unittest, unload, check_warnings
|
||||
from test.support import run_unittest, unload, check_warnings, CleanImport
|
||||
import unittest
|
||||
import sys
|
||||
import importlib
|
||||
|
@ -345,6 +345,23 @@ class ImportlibMigrationTests(unittest.TestCase):
|
|||
finally:
|
||||
__loader__ = this_loader
|
||||
|
||||
def test_get_loader_handles_missing_spec_attribute(self):
|
||||
name = 'spam'
|
||||
mod = type(sys)(name)
|
||||
del mod.__spec__
|
||||
with CleanImport(name):
|
||||
sys.modules[name] = mod
|
||||
loader = pkgutil.get_loader(name)
|
||||
self.assertIsNone(loader)
|
||||
|
||||
def test_get_loader_handles_spec_attribute_none(self):
|
||||
name = 'spam'
|
||||
mod = type(sys)(name)
|
||||
mod.__spec__ = None
|
||||
with CleanImport(name):
|
||||
sys.modules[name] = mod
|
||||
loader = pkgutil.get_loader(name)
|
||||
self.assertIsNone(loader)
|
||||
|
||||
def test_find_loader_avoids_emulation(self):
|
||||
with check_warnings() as w:
|
||||
|
|
|
@ -86,6 +86,8 @@ Library
|
|||
:func:`tempfile.NamedTemporaryFile`, close the file descriptor if
|
||||
:func:`io.open` fails
|
||||
|
||||
- Issue #21200: Return None from pkgutil.get_loader() when __spec__ is missing.
|
||||
|
||||
- Issue #21013: Enhance ssl.create_default_context() when used for server side
|
||||
sockets to provide better security by default.
|
||||
|
||||
|
|
Loading…
Reference in New Issue