VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-05-19 23:09:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix a few last standing issues with integration tests. ok after running tests with tox i see that they are not the last issues...

Browse Source
This commit is contained in:
Dave Halter
2014-01-12 00:33:13 +01:00
parent 1765fadf73
commit 4006b231d3
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/evaluate/__init__.py
+4 -4
View File
@@ -282,8 +282,8 @@ class Evaluator(object):
result += self.eval_call(call)
elif call == '*':
if [r for r in result if isinstance(r, iterable.Array)
or isinstance(r, er.Instance)
and str(r.name) == 'str']:
or isinstance(r, compiled.PyObject)
and isinstance(r.obj, (str, unicode))]:
# if it is an iterable, ignore * operations
next(calls_iterator)
return set(result)
@@ -452,8 +452,8 @@ def filter_private_variable(scope, call_scope, var_name):
if isinstance(var_name, (str, unicode)) and isinstance(scope, er.Instance)\
and var_name.startswith('__') and not var_name.endswith('__'):
s = call_scope.get_parent_until((pr.Class, er.Instance))
if not isinstance(scope.base, compiled.PyObject):
if s != scope and s != scope.base.base:
if s != scope and (isinstance(scope.base, compiled.PyObject)
or s != scope.base.base):
return True
return False