Merge branch 'master' into typeshed

There were quite a few conflicts, because there were two rewrites of the path to dotted function.
2019-03-01 10:03:17 +01:00
parent 2a9e678877 ffd9a6b484
commit 467c2e5def
12 changed files with 65 additions and 34 deletions
--- a/jedi/evaluate/imports.py
+++ b/jedi/evaluate/imports.py
@@ -522,7 +522,7 @@ def get_modules_containing_name(evaluator, modules, name):
                if base_names:
                    import_names = base_names + (module_name,)
                else:
-                    import_names = sys_path.calculate_dotted_path_from_sys_path(e_sys_path, path)
+                    import_names = sys_path.transform_path_to_dotted(e_sys_path, path)

                module = _load_module(
                    evaluator, path, code,