Remove restriction that a 'package' cannot be a module. Allows resolution of resources from adjacent modules, even those not found in a package. Fixes #203.

jaraco · jaraco · commit ecffc07564ed · 2022-07-22T14:02:51.000-04:00
diff --git a/importlib_resources/_common.py b/importlib_resources/_common.py
@@ -19,7 +19,7 @@ def files(package):
     """
     Get a Traversable resource from a package
     """
-    return from_package(get_package(package))
+    return from_package(resolve(package))
 
 
 def get_resource_reader(package):
@@ -44,18 +44,6 @@ def resolve(cand):
     return cand if isinstance(cand, types.ModuleType) else importlib.import_module(cand)
 
 
-def get_package(package):
-    # type: (Package) -> types.ModuleType
-    """Take a package name or module object and return the module.
-
-    Raise an exception if the resolved module is not a package.
-    """
-    resolved = resolve(package)
-    if wrap_spec(resolved).submodule_search_locations is None:
-        raise TypeError(f'{package!r} is not a package')
-    return resolved
-
-
 def from_package(package):
     """
     Return a Traversable object for the given package.
diff --git a/importlib_resources/tests/test_files.py b/importlib_resources/tests/test_files.py
@@ -64,10 +64,8 @@ def test_module_resources(self):
         _path.build(spec, self.site_dir)
         import mod
 
-        # currently a failure occurs; ref #203
-        with self.assertRaisesRegex(TypeError, '.*mod.* is not a package'):
-            actual = resources.files(mod).joinpath('res.txt').read_text()
-            assert actual == spec['res.txt']
+        actual = resources.files(mod).joinpath('res.txt').read_text()
+        assert actual == spec['res.txt']
 
 
 if __name__ == '__main__':
diff --git a/importlib_resources/tests/util.py b/importlib_resources/tests/util.py
@@ -102,17 +102,6 @@ def test_importing_module_as_side_effect(self):
         del sys.modules[data01.__name__]
         self.execute(data01.__name__, 'utf-8.file')
 
-    def test_non_package_by_name(self):
-        # The anchor package cannot be a module.
-        with self.assertRaises(TypeError):
-            self.execute(__name__, 'utf-8.file')
-
-    def test_non_package_by_package(self):
-        # The anchor package cannot be a module.
-        with self.assertRaises(TypeError):
-            module = sys.modules['importlib_resources.tests.util']
-            self.execute(module, 'utf-8.file')
-
     def test_missing_path(self):
         # Attempting to open or read or request the path for a
         # non-existent path should succeed if open_resource
