Merge remote-tracking branch 'origin/master' into typeshed

2019-04-13 01:52:15 +02:00
parent 3602c95341 b2f6758a9c
commit 05eb06d91b
5 changed files with 56 additions and 2 deletions
--- a/jedi/api/environment.py
+++ b/jedi/api/environment.py
@@ -334,7 +334,10 @@ def get_system_environment(version):

    if os.name == 'nt':
        for exe in _get_executables_from_windows_registry(version):
-            return Environment(exe)
+            try:
+                return Environment(exe)
+            except InvalidPythonEnvironment:
+                pass
    raise InvalidPythonEnvironment("Cannot find executable python%s." % version)