diff options
| author | Brett Cannon <brett@python.org> | 2016-02-21 02:37:04 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2016-02-21 02:37:04 (GMT) |
| commit | e5f4d3c2460bdedfcff196cb7399e407db69aa73 (patch) | |
| tree | e8f37921bcb9d2337f9153bf9a0819fc453a7725 | |
| parent | 0911c0d27176bb0501b87dd65ebfb47bc3da4e12 (diff) | |
| parent | 558823a0cf7834cb8bc45123604008e33b4e69e2 (diff) | |
| download | cpython-e5f4d3c2460bdedfcff196cb7399e407db69aa73.zip cpython-e5f4d3c2460bdedfcff196cb7399e407db69aa73.tar.gz cpython-e5f4d3c2460bdedfcff196cb7399e407db69aa73.tar.bz2 | |
Merge for issue #26186
| -rw-r--r-- | Lib/importlib/abc.py | 1 | ||||
| -rw-r--r-- | Lib/importlib/util.py | 5 | ||||
| -rw-r--r-- | Lib/test/test_importlib/test_lazy.py | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/Lib/importlib/abc.py b/Lib/importlib/abc.py index 11af22d..daff681 100644 --- a/Lib/importlib/abc.py +++ b/Lib/importlib/abc.py @@ -4,7 +4,6 @@ from . import _bootstrap_external from . import machinery try: import _frozen_importlib -# import _frozen_importlib_external except ImportError as exc: if exc.name != '_frozen_importlib': raise diff --git a/Lib/importlib/util.py b/Lib/importlib/util.py index 39cb0f7..af781fd 100644 --- a/Lib/importlib/util.py +++ b/Lib/importlib/util.py @@ -263,11 +263,6 @@ class LazyLoader(abc.Loader): def __check_eager_loader(loader): if not hasattr(loader, 'exec_module'): raise TypeError('loader must define exec_module()') - elif hasattr(loader.__class__, 'create_module'): - if abc.Loader.create_module != loader.__class__.create_module: - # Only care if create_module() is overridden in a subclass of - # importlib.abc.Loader. - raise TypeError('loader cannot define create_module()') @classmethod def factory(cls, loader): diff --git a/Lib/test/test_importlib/test_lazy.py b/Lib/test/test_importlib/test_lazy.py index 2e191bb..774b7a4 100644 --- a/Lib/test/test_importlib/test_lazy.py +++ b/Lib/test/test_importlib/test_lazy.py @@ -54,6 +54,7 @@ class LazyLoaderTests(unittest.TestCase): def test_init(self): with self.assertRaises(TypeError): + # Classes that dono't define exec_module() trigger TypeError. util.LazyLoader(object) def new_module(self, source_code=None): @@ -185,6 +185,9 @@ Core and Builtins Library ------- + +Issue #26186: Remove an invalid type check in importlib.util.LazyLoader. + - Issue #26367: importlib.__init__() raises ImportError like builtins.__import__() when ``level`` is specified but without an accompanying package specified. |