VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

BUGFIX: prevent an infinite loop seeking for a "conftest.py" file

Browse Source
This commit is contained in:
Samuele FAVAZZA
2021-01-30 16:31:26 +01:00
parent 9f41153eb2
commit 613cb08325
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jedi/plugins/pytest.py
View File

@@ -129,6 +129,10 @@ def _iter_pytest_modules(module_context, skip_own_module=False):
if file_io is not None: if file_io is not None:
folder = file_io.get_parent_folder() folder = file_io.get_parent_folder()
sys_path = module_context.inference_state.get_sys_path() sys_path = module_context.inference_state.get_sys_path()
# prevent an infinite loop when reaching the root of the current drive
last_folder = None
while any(folder.path.startswith(p) for p in sys_path): while any(folder.path.startswith(p) for p in sys_path):
file_io = folder.get_file_io('conftest.py') file_io = folder.get_file_io('conftest.py')
if Path(file_io.path) != module_context.py__file__(): if Path(file_io.path) != module_context.py__file__():
@@ -139,6 +143,11 @@ def _iter_pytest_modules(module_context, skip_own_module=False):
pass pass
folder = folder.get_parent_folder() folder = folder.get_parent_folder()
# prevent an infinite for loop if the same parent folder is return twice
if last_folder is not None and folder.path == last_folder.path:
break
last_folder = folder # keep track of the last found parent name
for names in _PYTEST_FIXTURE_MODULES: for names in _PYTEST_FIXTURE_MODULES:
for module_value in module_context.inference_state.import_module(names): for module_value in module_context.inference_state.import_module(names):
yield module_value.as_context() yield module_value.as_context()