VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-02-17 05:14:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge with master.

Browse Source
This commit is contained in:
Dave Halter
2017-01-02 13:00:58 +01:00
parent 96bb9e3c1a f05c0714c7
commit 5b9e5f96aa
12 changed files with 211 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jedi/evaluate/__init__.py
View File

@@ -430,7 +430,7 @@ class Evaluator(object):
def_ = name.get_definition()
is_simple_name = name.parent.type not in ('power', 'trailer')
if is_simple_name:
if name.parent.type == 'classdef':
if name.parent.type == 'classdef' and name.parent.name == name:
return [er.ClassContext(self, name.parent, context)]
elif name.parent.type == 'funcdef':
return [er.FunctionContext(self, context, name.parent)]

4
jedi/evaluate/sys_path.py
View File

@@ -28,14 +28,13 @@ def get_venv_path(venv):
def _get_sys_path_with_egglinks(sys_path):
"""Find all paths including those referenced by egg-links.
Egg-link-referenced directories are inserted into path immediately after
Egg-link-referenced directories are inserted into path immediately before
the directory on which their links were found. Such directories are not
taken into consideration by normal import mechanism, but they are traversed
when doing pkg_resources.require.
"""
result = []
for p in sys_path:
result.append(p)
# pkg_resources does not define a specific order for egg-link files
# using os.listdir to enumerate them, we're sorting them to have
# reproducible tests.
@@ -48,6 +47,7 @@ def _get_sys_path_with_egglinks(sys_path):
# pkg_resources package only interprets the first
# non-empty line in egg-link files.
break
result.append(p)
return result