maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

instance_path for namespace packages uses path closest to submodule

Browse source
This commit is contained in:
Evgeny Prigorodov 2022-05-26 21:12:36 +02:00 • committed by David Lord
parent fb89745408
commit 88bcf78439
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
3 changed files with 48 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/flask/scaffold.py
View file

@ -780,30 +780,46 @@ def _matching_loader_thinks_module_is_package(loader, mod_name):
)
def _find_package_path(root_mod_name):
def _find_package_path(import_name):
"""Find the path that contains the package or module."""
try:
spec = importlib.util.find_spec(root_mod_name)
root_mod_name, _, _ = import_name.partition(".")
if spec is None:
try:
root_spec = importlib.util.find_spec(root_mod_name)
if root_spec is None:
raise ValueError("not found")
# ImportError: the machinery told us it does not exist
# ValueError:
# - the module name was invalid
# - the module name is __main__
# - *we* raised `ValueError` due to `spec` being `None`
# - *we* raised `ValueError` due to `root_spec` being `None`
except (ImportError, ValueError):
pass # handled below
else:
# namespace package
if spec.origin in {"namespace", None}:
return os.path.dirname(next(iter(spec.submodule_search_locations)))
if root_spec.origin in {"namespace", None}:
package_spec = importlib.util.find_spec(import_name)
if package_spec is not None and package_spec.submodule_search_locations:
# Pick the path in the namespace that contains the submodule.
package_path = os.path.commonpath(
package_spec.submodule_search_locations
)
search_locations = (
location
for location in root_spec.submodule_search_locations
if package_path.startswith(location)
)
else:
# Pick the first path.
search_locations = iter(root_spec.submodule_search_locations)
return os.path.dirname(next(search_locations))
# a package (with __init__.py)
elif spec.submodule_search_locations:
return os.path.dirname(os.path.dirname(spec.origin))
elif root_spec.submodule_search_locations:
return os.path.dirname(os.path.dirname(root_spec.origin))
# just a normal module
else:
return os.path.dirname(spec.origin)
return os.path.dirname(root_spec.origin)
# we were unable to find the `package_path` using PEP 451 loaders
loader = pkgutil.get_loader(root_mod_name)
@ -845,8 +861,7 @@ def find_package(import_name: str):
for import. If the package is not installed, it's assumed that the
package was imported from the current working directory.
"""
root_mod_name, _, _ = import_name.partition(".")
package_path = _find_package_path(root_mod_name)
package_path = _find_package_path(import_name)
py_prefix = os.path.abspath(sys.prefix)
# installed to the system