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

fix a few more minor issues

Browse Source
This commit is contained in:
Dave Halter
2014-01-11 16:14:58 +01:00
parent c6a14a348e
commit d430ef53a7
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jedi/evaluate/imports.py
View File

@@ -436,7 +436,7 @@ def get_modules_containing_name(mods, name):
return load_module(path, source) return load_module(path, source)
# skip non python modules # skip non python modules
mods = set(m for m in mods if m.path is None or m.path.endswith('.py')) mods = set(m for m in mods if not isinstance(m, compiled.PyObject))
mod_paths = set() mod_paths = set()
for m in mods: for m in mods:
mod_paths.add(m.path) mod_paths.add(m.path)

2
jedi/evaluate/iterable.py
View File

@@ -228,7 +228,7 @@ def _check_array_additions(evaluator, compare_array, module, is_list):
>>> a = [""] >>> a = [""]
>>> a.append(1) >>> a.append(1)
""" """
if not settings.dynamic_array_additions or module.is_builtin(): if not settings.dynamic_array_additions or isinstance(module, compiled.PyObject):
return [] return []
def check_calls(calls, add_name): def check_calls(calls, add_name):

2
jedi/evaluate/param.py
View File

@@ -155,7 +155,7 @@ def _var_args_iterator(evaluator, var_args):
yield None, field_stmt yield None, field_stmt
elif isinstance(array, iterable.Generator): elif isinstance(array, iterable.Generator):
for field_stmt in array.iter_content(): for field_stmt in array.iter_content():
yield None, helpers._FakeStatement([field_stmt]) yield None, helpers.FakeStatement([field_stmt])
# **kwargs # **kwargs
elif expression_list[0] == '**': elif expression_list[0] == '**':
for array in evaluator.eval_expression_list(expression_list[1:]): for array in evaluator.eval_expression_list(expression_list[1:]):

6
jedi/parser/representation.py
View File

@@ -362,17 +362,13 @@ class SubModule(Scope, Module):
string = '' # no path -> empty name string = '' # no path -> empty name
else: else:
sep = (re.escape(os.path.sep),) * 2 sep = (re.escape(os.path.sep),) * 2
r = re.search(r'([^%s]*?)(%s__init__)?(\.py|\.so)?$' % sep, r = re.search(r'([^%s]*?)(%s__init__)?(\.py|\.so)?$' % sep, self.path)
self.path)
# remove PEP 3149 names # remove PEP 3149 names
string = re.sub('\.[a-z]+-\d{2}[mud]{0,3}$', '', r.group(1)) string = re.sub('\.[a-z]+-\d{2}[mud]{0,3}$', '', r.group(1))
# positions are not real therefore choose (0, 0) # positions are not real therefore choose (0, 0)
names = [(string, (0, 0))] names = [(string, (0, 0))]
return Name(self, names, (0, 0), (0, 0), self.use_as_parent) return Name(self, names, (0, 0), (0, 0), self.use_as_parent)
def is_builtin(self):
return not (self.path is None or self.path.endswith('.py'))
@property @property
def has_explicit_absolute_import(self): def has_explicit_absolute_import(self):
""" """