summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Snow <ericsnowcurrently@gmail.com>2013-10-05 02:28:52 (GMT)
committerEric Snow <ericsnowcurrently@gmail.com>2013-10-05 02:28:52 (GMT)
commit7e70fa53142564bed7415b3798c3e77f0574f816 (patch)
treebd0064989ee3d261385c70a7f729f5a1bce73f7b
parent17f1eddcfe886fbb11a71550978e37533e19d79e (diff)
downloadcpython-7e70fa53142564bed7415b3798c3e77f0574f816.zip
cpython-7e70fa53142564bed7415b3798c3e77f0574f816.tar.gz
cpython-7e70fa53142564bed7415b3798c3e77f0574f816.tar.bz2
[issue 19152] Ensure we have actually registered ExtensionFileLoader as an ExecutionLoader.
-rw-r--r--Lib/importlib/abc.py4
-rw-r--r--Lib/test/test_importlib/test_abc.py1
2 files changed, 3 insertions, 2 deletions
diff --git a/Lib/importlib/abc.py b/Lib/importlib/abc.py
index dcbe010..01de67d 100644
--- a/Lib/importlib/abc.py
+++ b/Lib/importlib/abc.py
@@ -188,7 +188,7 @@ class InspectLoader(Loader):
load_module = _bootstrap._LoaderBasics.load_module
_register(InspectLoader, machinery.BuiltinImporter, machinery.FrozenImporter,
- machinery.ExtensionFileLoader, _bootstrap.NamespaceLoader)
+ _bootstrap.NamespaceLoader)
class ExecutionLoader(InspectLoader):
@@ -237,7 +237,7 @@ class ExecutionLoader(InspectLoader):
super().init_module_attrs(module)
_bootstrap._init_file_attrs(self, module)
-_register(machinery.ExtensionFileLoader)
+_register(ExecutionLoader, machinery.ExtensionFileLoader)
class FileLoader(_bootstrap.FileLoader, ResourceLoader, ExecutionLoader):
diff --git a/Lib/test/test_importlib/test_abc.py b/Lib/test/test_importlib/test_abc.py
index bfdd6f1..979a481 100644
--- a/Lib/test/test_importlib/test_abc.py
+++ b/Lib/test/test_importlib/test_abc.py
@@ -100,6 +100,7 @@ Frozen_InspectLoaderInheritanceTests, Source_InspectLoaderInheritanceTests = tes
class ExecutionLoader(InheritanceTests):
superclass_names = ['InspectLoader']
+ subclass_names = ['ExtensionFileLoader']
tests = create_inheritance_tests(ExecutionLoader)
Frozen_ExecutionLoaderInheritanceTests, Source_ExecutionLoaderInheritanceTests = tests