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

PyObject -> CompiledObject, PyName -> CompiledName

Browse Source
This commit is contained in:
Dave Halter
2014-01-13 14:08:23 +01:00
parent 0c98c05cd3
commit 83b490dd6d
10 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/api/__init__.py
View File

@@ -143,7 +143,7 @@ class Script(object):
if not dot:
# add named params
for call_def in self.call_signatures():
if not isinstance(call_def.module, compiled.PyObject):
if not isinstance(call_def.module, compiled.CompiledObject):
for p in call_def.params:
completions.append((p.get_name(), p))
@@ -519,7 +519,7 @@ class Script(object):
return [classes.CallDef(o, index, call) for o in origins
if o.isinstance(er.Function, er.Instance, er.Class)
or isinstance(o, compiled.PyObject) and o.type() != 'module']
or isinstance(o, compiled.CompiledObject) and o.type() != 'module']
def _func_call_and_param_index(self):
debug.speed('func_call start')

8
jedi/api/classes.py
View File

@@ -138,7 +138,7 @@ class BaseDefinition(object):
"""
# generate the type
stripped = self._definition
if isinstance(stripped, compiled.PyObject):
if isinstance(stripped, compiled.CompiledObject):
return stripped.type()
if isinstance(stripped, er.InstanceElement):
stripped = stripped.var
@@ -183,7 +183,7 @@ class BaseDefinition(object):
def in_builtin_module(self):
"""Whether this is a builtin module."""
return isinstance(self._module, compiled.PyObject)
return isinstance(self._module, compiled.CompiledObject)
@property
def line_nr(self):
@@ -440,7 +440,7 @@ class Definition(BaseDefinition):
if isinstance(d, er.InstanceElement):
d = d.var
if isinstance(d, compiled.PyObject):
if isinstance(d, compiled.CompiledObject):
return d.name
elif isinstance(d, pr.Name):
return d.names[-1] if d.names else None
@@ -496,7 +496,7 @@ class Definition(BaseDefinition):
if isinstance(d, pr.Name):
d = d.parent
if isinstance(d, compiled.PyObject):
if isinstance(d, compiled.CompiledObject):
d = d.type() + ' ' + d.name
elif isinstance(d, iterable.Array):
d = 'class ' + d.type