|
17 | 17 | _PKG_DIRECTORY = 5 |
18 | 18 | _C_BUILTIN = 6 |
19 | 19 | _PY_FROZEN = 7 |
20 | | -_NAMESPACE = 8 |
21 | 20 |
|
22 | 21 | # Modulefinder does a good job at simulating Python's, but it can not |
23 | 22 | # handle __path__ modifications packages make at runtime. Therefore there |
@@ -68,7 +67,7 @@ def _find_module(name, path=None): |
68 | 67 | file_path = spec.origin |
69 | 68 |
|
70 | 69 | if isinstance(spec.loader, importlib.machinery.NamespaceLoader): |
71 | | - return None, spec.submodule_search_locations, ("", "", _NAMESPACE) |
| 70 | + return None, spec.submodule_search_locations, ("", "", _PKG_DIRECTORY) |
72 | 71 |
|
73 | 72 | if spec.loader.is_package(name): # non-namespace package |
74 | 73 | return None, os.path.dirname(file_path), ("", "", _PKG_DIRECTORY) |
@@ -333,7 +332,7 @@ def import_module(self, partname, fqname, parent): |
333 | 332 | def load_module(self, fqname, fp, pathname, file_info): |
334 | 333 | suffix, mode, type = file_info |
335 | 334 | self.msgin(2, "load_module", fqname, fp and "fp", pathname) |
336 | | - if type in (_PKG_DIRECTORY, _NAMESPACE): |
| 335 | + if type == _PKG_DIRECTORY: |
337 | 336 | m = self.load_package(fqname, pathname) |
338 | 337 | self.msgout(2, "load_module ->", m) |
339 | 338 | return m |
|
0 commit comments