1
0
forked from VimPlug/jedi

builtin.Parser -> builtin.BuiltinModule

This commit is contained in:
David Halter
2013-02-06 15:42:27 +01:00
parent acf81225b7
commit 59de98af67
2 changed files with 6 additions and 6 deletions

View File

@@ -16,7 +16,7 @@ import evaluate
import modules import modules
class Parser(modules.CachedModule): class BuiltinModule(modules.CachedModule):
""" """
This module is a parser for all builtin modules, which are programmed in This module is a parser for all builtin modules, which are programmed in
C/C++. It should also work on third party modules. C/C++. It should also work on third party modules.
@@ -50,7 +50,7 @@ class Parser(modules.CachedModule):
if not name: if not name:
name = os.path.basename(path) name = os.path.basename(path)
name = name.rpartition('.')[0] # cut file type (normally .so) name = name.rpartition('.')[0] # cut file type (normally .so)
super(Parser, self).__init__(path=path, name=name) super(BuiltinModule, self).__init__(path=path, name=name)
self.sys_path = list(sys_path) self.sys_path = list(sys_path)
self._module = None self._module = None
@@ -376,7 +376,7 @@ def parse_function_doc(func):
# New object -> object() # New object -> object()
ret_str = re.sub(r'[nN]ew (.*)', r'\1()', ret_str) ret_str = re.sub(r'[nN]ew (.*)', r'\1()', ret_str)
ret = Parser.map_types.get(ret_str, ret_str) ret = BuiltinModule.map_types.get(ret_str, ret_str)
if ret == ret_str and ret not in ['None', 'object', 'tuple', 'set']: if ret == ret_str and ret not in ['None', 'object', 'tuple', 'set']:
debug.dbg('not working', ret_str) debug.dbg('not working', ret_str)
if ret != 'pass': if ret != 'pass':
@@ -397,7 +397,7 @@ class Builtin(object):
@property @property
def builtin(self): def builtin(self):
if self._builtin is None: if self._builtin is None:
self._builtin = Parser(name=self.name) self._builtin = BuiltinModule(name=self.name)
return self._builtin return self._builtin
@property @property

View File

@@ -281,9 +281,9 @@ class ImportPath(pr.Base):
if path.endswith('.py'): if path.endswith('.py'):
f = modules.Module(path, source) f = modules.Module(path, source)
else: else:
f = builtin.Parser(path=path) f = builtin.BuiltinModule(path=path)
else: else:
f = builtin.Parser(name=path) f = builtin.BuiltinModule(name=path)
return f.parser.module, rest return f.parser.module, rest