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

first executions with compiled seem to be working

Browse Source
This commit is contained in:
Dave Halter
2014-01-09 00:53:50 +01:00
parent 7af9e6dfd7
commit 3017e72b86
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
jedi/evaluate/compiled.py
View File

@@ -20,6 +20,9 @@ class PyObject(object):
self.instantiated = instantiated self.instantiated = instantiated
self.doc = inspect.getdoc(obj) self.doc = inspect.getdoc(obj)
def __repr__(self):
return '<%s: %s>' % (type(self).__name__, self.obj)
@underscore_memoization @underscore_memoization
def _parse_function_doc(self): def _parse_function_doc(self):
if self.doc is None: if self.doc is None:
@@ -31,10 +34,10 @@ class PyObject(object):
# We don't want to execute properties, therefore we have to try to get # We don't want to execute properties, therefore we have to try to get
# the class # the class
cls = self cls = self
if not (inspect.isclass(cls) or inspect.ismodule(cls)): if not (inspect.isclass(self.obj) or inspect.ismodule(self.obj)):
cls = PyObject(self.obj.__class__, self.parent) cls = PyObject(self.obj.__class__, self.parent)
for name in dir(cls): for name in dir(cls.obj):
yield PyName(cls, name) yield PyName(cls, name)
def isinstance(self, *obj): def isinstance(self, *obj):
@@ -47,15 +50,14 @@ class PyObject(object):
def execute(self, params): def execute(self, params):
if inspect.isclass(self.obj): if inspect.isclass(self.obj):
return [PyObject(self.obj, self.parent, True)] yield PyObject(self.obj, self.parent, True)
elif inspect.isbuiltin(self.obj) or inspect.ismethod(self.obj) \ elif inspect.isbuiltin(self.obj) or inspect.ismethod(self.obj) \
or inspect.ismethoddescriptor(self.obj): or inspect.ismethoddescriptor(self.obj):
for name in self._parse_function_doc()[1].split():
self.doc try:
return [] yield PyObject(getattr(_builtins, name), builtin, True)
else: except AttributeError:
return [] pass
return []
class PyName(object): class PyName(object):
@@ -86,13 +88,14 @@ docstr_defaults = {
'character': 'str', 'character': 'str',
'integer': 'int', 'integer': 'int',
'dictionary': 'dict', 'dictionary': 'dict',
'string': 'str',
} }
if is_py3k: if is_py3k:
#docstr_defaults['file object'] = 'import io; return io.TextIOWrapper()' #docstr_defaults['file object'] = 'import io; return io.TextIOWrapper()'
pass # TODO reenable pass # TODO reenable
else: else:
docstr_defaults['file object'] = file docstr_defaults['file object'] = 'file'
def _parse_function_doc(doc): def _parse_function_doc(doc):
@@ -152,10 +155,7 @@ def _parse_function_doc(doc):
ret_str = re.sub(r'[nN]ew (.*)', r'\1()', ret_str) ret_str = re.sub(r'[nN]ew (.*)', r'\1()', ret_str)
ret = docstr_defaults.get(ret_str, ret_str) ret = docstr_defaults.get(ret_str, ret_str)
if ret == ret_str and ret not in ['None', 'object', 'tuple', 'set']:
debug.dbg('not working', ret_str)
ret = ('return ' if 'return' not in ret else '') + ret
return param_str, ret return param_str, ret

5
test/test_compiled.py
View File

@@ -9,6 +9,7 @@ def test_simple():
obj = compiled.PyObject('_str_', bltn) obj = compiled.PyObject('_str_', bltn)
upper = e.find_types(obj, 'upper') upper = e.find_types(obj, 'upper')
assert len(upper) == 1 assert len(upper) == 1
objs = e.execute(upper[0]) objs = list(e.execute(upper[0]))
assert len(objs) == 1 assert len(objs) == 1
assert isinstance(objs[0].obj, str) assert objs[0].obj is str
assert objs[0].instantiated is True