Merge branch 'dev' of https://github.com/bstaint/jedi into dev

This commit is contained in:
Dave Halter
2016-08-01 15:17:52 +02:00
3 changed files with 16 additions and 1 deletions

View File

@@ -340,7 +340,13 @@ def dotted_from_fs_path(fs_path, sys_path):
for s in sys_path:
if (fs_path.startswith(s) and len(path) < len(s)):
path = s
return _path_re.sub('', fs_path[len(path):].lstrip(os.path.sep)).replace(os.path.sep, '.')
# - Window
# X:\path\to\lib-dynload/datetime.pyd => datetime
module_path = fs_path[len(path):].lstrip(os.path.sep).lstrip('/')
# - Window
# Replace like X:\path\to\something/foo/bar.py
return _path_re.sub('', module_path).replace(os.path.sep, '.').replace('/', '.')
def load_module(evaluator, path=None, name=None):