mirror of
https://github.com/python/cpython.git
synced 2025-12-08 06:10:17 +00:00
Remove all debugging junk
This commit is contained in:
parent
19c49bb878
commit
16e44afeb7
2 changed files with 0 additions and 71 deletions
|
|
@ -130,15 +130,12 @@ def _find_modules(self, path: str, prefix: str) -> list[str]:
|
||||||
for segment in path.split('.'):
|
for segment in path.split('.'):
|
||||||
modules = [mod_info for mod_info in modules
|
modules = [mod_info for mod_info in modules
|
||||||
if mod_info.ispkg and mod_info.name == segment]
|
if mod_info.ispkg and mod_info.name == segment]
|
||||||
print(f"{segment=}, {modules=}") # TEMPORARY -- debugging tests on windows
|
|
||||||
if is_stdlib_import is None:
|
if is_stdlib_import is None:
|
||||||
# Top-level import decide if we import from stdlib or not
|
# Top-level import decide if we import from stdlib or not
|
||||||
is_stdlib_import = all(
|
is_stdlib_import = all(
|
||||||
self._is_stdlib_module(mod_info) for mod_info in modules
|
self._is_stdlib_module(mod_info) for mod_info in modules
|
||||||
)
|
)
|
||||||
modules = self.iter_submodules(modules)
|
modules = self.iter_submodules(modules)
|
||||||
modules = list(modules) # TEMPORARY -- debugging tests on windows
|
|
||||||
print(f"segment=last, {modules=}") # TEMPORARY -- debugging tests on windows
|
|
||||||
|
|
||||||
module_names = [module.name for module in modules]
|
module_names = [module.name for module in modules]
|
||||||
if is_stdlib_import:
|
if is_stdlib_import:
|
||||||
|
|
@ -217,72 +214,7 @@ def global_cache(self) -> list[pkgutil.ModuleInfo]:
|
||||||
"""Global module cache"""
|
"""Global module cache"""
|
||||||
if not self._global_cache or self._curr_sys_path != sys.path:
|
if not self._global_cache or self._curr_sys_path != sys.path:
|
||||||
self._curr_sys_path = sys.path[:]
|
self._curr_sys_path = sys.path[:]
|
||||||
print('getting packages/') # TEMPORARY -- debugging tests on windows
|
|
||||||
self._global_cache = list(pkgutil.iter_modules())
|
self._global_cache = list(pkgutil.iter_modules())
|
||||||
# === BEGIN TEMPORARY -- debugging tests on windows ===
|
|
||||||
mymod = next((p for p in self._global_cache if p.name == "mymodule"), None)
|
|
||||||
if mymod:
|
|
||||||
print("0a", mymod)
|
|
||||||
import glob
|
|
||||||
print("files on finder path:", glob.glob("**", root_dir=mymod.module_finder.path, recursive=True))
|
|
||||||
spec = mymod.module_finder.find_spec(mymod.name, None)
|
|
||||||
print("found spec:", spec)
|
|
||||||
mymod.module_finder.invalidate_caches()
|
|
||||||
not_cached_spec = mymod.module_finder.find_spec(mymod.name, None)
|
|
||||||
print("found spec after invalidate:", not_cached_spec)
|
|
||||||
if spec:
|
|
||||||
print("1")
|
|
||||||
assert spec.submodule_search_locations and len(spec.submodule_search_locations) == 1
|
|
||||||
print("2")
|
|
||||||
importer = pkgutil.get_importer(spec.submodule_search_locations[0])
|
|
||||||
print("3")
|
|
||||||
assert importer and isinstance(importer, FileFinder)
|
|
||||||
print("4")
|
|
||||||
if importer.path is None or not os.path.isdir(importer.path):
|
|
||||||
print("4a")
|
|
||||||
return
|
|
||||||
yielded = {}
|
|
||||||
import inspect
|
|
||||||
try:
|
|
||||||
filenames = os.listdir(importer.path)
|
|
||||||
except OSError:
|
|
||||||
# ignore unreadable directories like import does
|
|
||||||
print("4b")
|
|
||||||
filenames = []
|
|
||||||
print("4c", filenames)
|
|
||||||
filenames.sort() # handle packages before same-named modules
|
|
||||||
submods = []
|
|
||||||
for fn in filenames:
|
|
||||||
print("4d", fn)
|
|
||||||
modname = inspect.getmodulename(fn)
|
|
||||||
print("4e", modname)
|
|
||||||
if modname=='__init__' or modname in yielded:
|
|
||||||
print("4f", modname)
|
|
||||||
continue
|
|
||||||
path = os.path.join(importer.path, fn)
|
|
||||||
ispkg = False
|
|
||||||
if not modname and os.path.isdir(path) and '.' not in fn:
|
|
||||||
print("4g")
|
|
||||||
modname = fn
|
|
||||||
try:
|
|
||||||
dircontents = os.listdir(path)
|
|
||||||
except OSError:
|
|
||||||
# ignore unreadable directories like import does
|
|
||||||
dircontents = []
|
|
||||||
for fn in dircontents:
|
|
||||||
subname = inspect.getmodulename(fn)
|
|
||||||
if subname=='__init__':
|
|
||||||
ispkg = True
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
continue # not a package
|
|
||||||
if modname and '.' not in modname:
|
|
||||||
print("4h")
|
|
||||||
yielded[modname] = 1
|
|
||||||
submods.append((importer, modname, ispkg))
|
|
||||||
print("4i")
|
|
||||||
print("module:", mymod, submods)
|
|
||||||
# === END TEMPORARY ===
|
|
||||||
return self._global_cache
|
return self._global_cache
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1142,9 +1142,6 @@ def test_already_imported_custom_module_no_other_suggestions(self):
|
||||||
self.assertEqual(output, "import mymodule.foo")
|
self.assertEqual(output, "import mymodule.foo")
|
||||||
|
|
||||||
del sys.modules["mymodule"]
|
del sys.modules["mymodule"]
|
||||||
print(f"{dir1=}, {dir2=}") # TEMPORARY -- debugging tests on windows
|
|
||||||
print(f"{[p.relative_to(dir1) for p in dir1.glob("**")]=}") # TEMPORARY -- debugging tests on windows
|
|
||||||
print(f"{[p.relative_to(dir2) for p in dir2.glob("**")]=}") # TEMPORARY -- debugging tests on windows
|
|
||||||
# mymodule not imported anymore -> suggest dir2 submodules
|
# mymodule not imported anymore -> suggest dir2 submodules
|
||||||
events = code_to_events("import mymodule.\t\n")
|
events = code_to_events("import mymodule.\t\n")
|
||||||
reader = self.prepare_reader(events, namespace={})
|
reader = self.prepare_reader(events, namespace={})
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue