Support packages that span multiple directories

src/slotscheck/discovery.py

@@ -20,6 +20,7 @@
  Iterator,
  NamedTuple,
  Optional,
+ Tuple,
  Union,
 )
 
@@ -172,10 +173,7 @@ def module_tree(
  if spec.submodule_search_locations is None:
  tree = Module(name)
  else:
- assert len(spec.submodule_search_locations) == 1
- pkg_location = Path(spec.submodule_search_locations[0])
- location = location or pkg_location
- tree = _package(name, pkg_location)
+ tree = _package(name, spec.submodule_search_locations)
 
  if expected_location and location != expected_location:
  raise UnexpectedImportLocation(module, expected_location, location)
@@ -189,27 +187,27 @@ def _add_namespace(tree: ModuleTree, name: ModuleNamePart) -> ModuleTree:
 
 def _submodule(m: pkgutil.ModuleInfo) -> ModuleTree:
  if m.ispkg:
- [subdir] = m.module_finder.find_spec(
-  m.name # type: ignore
- ).submodule_search_locations
- return _package(m.name, Path(subdir))
+ spec = m.module_finder.find_spec(m.name) # type: ignore[call-arg]
+ assert spec is not None
+ assert spec.submodule_search_locations is not None
+ return _package(m.name, spec.submodule_search_locations)
  else:
  return Module(m.name)
 
 
-def _is_submodule(m: pkgutil.ModuleInfo, path: AbsPath) -> bool:
- return getattr(m.module_finder, "path", "").startswith(str(path))
+def _is_submodule(m: pkgutil.ModuleInfo, paths: Tuple[str, ...]) -> bool:
+ return getattr(m.module_finder, "path", "").startswith(paths)
 
 
-def _package(name: ModuleNamePart, path: AbsPath) -> Package:
+def _package(name: ModuleNamePart, paths: Collection[str]) -> Package:
  return Package(
  name,
  frozenset(
  map(
  _submodule,
  filter(
- partial(_is_submodule, path=path),
- pkgutil.walk_packages([str(path)]),
+ partial(_is_submodule, paths=tuple(paths)),
+ pkgutil.iter_modules(paths),
  ),
  )
  ),

tests/examples/other/implicitly_namespaced/bar.py

@@ -0,0 +1,2 @@
+class C:
+ __slots__ = ()

tests/src/test_cli.py

@@ -162,6 +162,14 @@ def test_namespaced(runner: CliRunner):
  assert result.output == "All OK!\nScanned 4 module(s), 1 class(es).\n"
 
 
+def test_implicitly_namespaced(runner: CliRunner):
+ result = runner.invoke(
+ cli, ["-m", "implicitly_namespaced"], catch_exceptions=False
+ )
+ assert result.exit_code == 0
+ assert result.output == "All OK!\nScanned 8 module(s), 2 class(es).\n"
+
+
 def test_multiple_modules(runner: CliRunner):
  result = runner.invoke(
  cli,

tests/src/test_discovery.py

@@ -232,6 +232,7 @@ def test_implicitly_namespaced_submodule(self):
  def test_implicitly_namespaced(self):
  assert module_tree("implicitly_namespaced", None) == make_pkg(
  "implicitly_namespaced",
+ Module("bar"),
  Module("version"),
  make_pkg("module", Module("foo"), Module("bla")),
  make_pkg("another", Module("foo")),