Merge branch 'master' into refactor

2020-03-13 23:53:09 +01:00
parent f83844408f 5cd212c51c
commit 10bc578bfe
29 changed files with 331 additions and 54 deletions
--- a/jedi/inference/compiled/subprocess/init.py
+++ b/jedi/inference/compiled/subprocess/init.py
@@ -297,7 +297,7 @@ class Listener(object):
        try:
            inference_state = self._inference_states[inference_state_id]
        except KeyError:
-            from jedi.api.environment import InterpreterEnvironment
+            from jedi import InterpreterEnvironment
            inference_state = InferenceState(
                # The project is not actually needed. Nothing should need to
                # access it.