Raise an exception with a better message from importlib.resources.files() when module spec is not available

Author: whitphx

Lib/importlib/resources/_adapters.py

@@ -3,13 +3,17 @@
 
 from . import abc
 
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from ..machinery import ModuleSpec
+
 
 class SpecLoaderAdapter:
     """
     Adapt a package spec to adapt the underlying loader.
     """
 
-    def __init__(self, spec, adapter=lambda spec: spec.loader):
+    def __init__(self, spec: ModuleSpec, adapter):
         self.spec = spec
         self.loader = adapter(spec)
 
@@ -160,9 +164,9 @@ def files(self):
         return CompatibilityFiles.SpecPath(self.spec, self._reader)
 
 
-def wrap_spec(package):
+def wrap_spec(spec: ModuleSpec):
     """
     Construct a package spec with traversable compatibility
     on the spec/loader/reader.
     """
-    return SpecLoaderAdapter(package.__spec__, TraversableResourcesLoader)
+    return SpecLoaderAdapter(spec, TraversableResourcesLoader)

Lib/importlib/resources/_common.py

@@ -113,7 +113,10 @@ def from_package(package: types.ModuleType):
     # deferred for performance (python/cpython#109829)
     from ._adapters import wrap_spec
 
-    spec = wrap_spec(package)
+    if package.__spec__ is None:
+        raise TypeError(f"Can't access resources on a module with no spec: {package}")
+
+    spec = wrap_spec(package.__spec__)
     reader = spec.loader.get_resource_reader(spec.name)
     return reader.files()
 

Lib/test/test_importlib/resources/test_resource.py

@@ -1,4 +1,5 @@
 import unittest
+import types
 
 from . import util
 from importlib import resources, import_module
@@ -232,5 +233,17 @@ class ResourceFromNamespaceZipTests(
     MODULE = 'namespacedata01'
 
 
+class ResourceFromMainModuleWithNoneSpecTests(unittest.TestCase):
+    # `__main__.__spec__` can be `None` depending on how it is populated.
+    # https://docs.python.org/3/reference/import.html#main-spec
+    def test_main_module_with_none_spec(self):
+        mainmodule = types.ModuleType("__main__")
+
+        self.assertIsNone(mainmodule.__spec__)
+
+        with self.assertRaises(TypeError):
+            resources.files(mainmodule)
+
+
 if __name__ == '__main__':
     unittest.main()