VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

different little beauty improvements

Browse Source
This commit is contained in:
David Halter
2013-02-09 03:16:10 +01:00
parent 9540025a02
commit a1e366f791
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/evaluate.py
View File

@@ -372,8 +372,8 @@ def find_name(scope, name_str, position=None, search_global=False,
if not result and isinstance(nscope, er.Instance): if not result and isinstance(nscope, er.Instance):
# __getattr__ / __getattribute__ # __getattr__ / __getattribute__
result += check_getattr(nscope, name_str) result += check_getattr(nscope, name_str)
debug.dbg('sfn filter "%s" in %s: %s@%s' % (name_str, nscope, result, debug.dbg('sfn filter "%s" in (%s-%s): %s@%s' % (name_str, nscope,
position)) scope, result, position))
return result return result
def descriptor_check(result): def descriptor_check(result):

16
jedi/evaluate_representation.py
View File

@@ -701,6 +701,7 @@ class Execution(Executable):
@property @property
@cache.memoize_default() @cache.memoize_default()
def returns(self): def returns(self):
print self.copy_properties('returns')[0].parent
return self.copy_properties('returns') return self.copy_properties('returns')
@property @property
@@ -841,18 +842,9 @@ class Array(use_metaclass(cache.CachedMetaClass, pr.Base)):
def get_contents(self): def get_contents(self):
return self._array return self._array
@property
def parent(self):
"""
Return the builtin scope as parent, because the arrays are builtins
"""
return builtin.Builtin.scope
def get_parent_until(self, *args, **kwargs):
return builtin.Builtin.scope
def __getattr__(self, name): def __getattr__(self, name):
if name not in ['type', 'start_pos', 'get_only_subelement']: if name not in ['type', 'start_pos', 'get_only_subelement', 'parent',
'get_parent_until']:
raise AttributeError('Strange access on %s: %s.' % (self, name)) raise AttributeError('Strange access on %s: %s.' % (self, name))
return getattr(self._array, name) return getattr(self._array, name)
@@ -872,7 +864,7 @@ class ArrayMethod(object):
def __getattr__(self, name): def __getattr__(self, name):
# Set access privileges: # Set access privileges:
if name not in ['parent', 'names', 'start_pos', 'end_pos', 'get_code']: if name not in ['parent', 'names', 'start_pos', 'end_pos', 'get_code']:
raise AttributeError('Strange access: %s.' % name) raise AttributeError('Strange accesson %s: %s.' % (self, name))
return getattr(self.name, name) return getattr(self.name, name)
def get_parent_until(self): def get_parent_until(self):