VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-06 22:14:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sure to be able to deal with all kinds of loaders, fixes #1487

Browse Source
This commit is contained in:
Dave Halter
2020-01-31 13:26:56 +01:00
parent e930f47861
commit e1425de8a4
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jedi/_compatibility.py
View File

@@ -113,7 +113,12 @@ def find_module_py33(string, path=None, loader=None, full_name=None, is_global_s
def _from_loader(loader, string): def _from_loader(loader, string):
is_package = loader.is_package(string) try:
is_package_method = loader.is_package
except AttributeError:
is_package = False
else:
is_package = is_package_method(string)
try: try:
get_filename = loader.get_filename get_filename = loader.get_filename
except AttributeError: except AttributeError:
@@ -123,7 +128,11 @@ def _from_loader(loader, string):
# To avoid unicode and read bytes, "overwrite" loader.get_source if # To avoid unicode and read bytes, "overwrite" loader.get_source if
# possible. # possible.
f = type(loader).get_source try:
f = type(loader).get_source
except AttributeError:
raise ImportError("get_source was not defined on loader")
if is_py3 and f is not importlib.machinery.SourceFileLoader.get_source: if is_py3 and f is not importlib.machinery.SourceFileLoader.get_source:
# Unfortunately we are reading unicode here, not bytes. # Unfortunately we are reading unicode here, not bytes.
# It seems hard to get bytes, because the zip importer # It seems hard to get bytes, because the zip importer