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

'fix a couple of error locations'

Browse Source
This commit is contained in:
Matthias Bussonnier
2017-02-23 15:29:23 -08:00
committed by Dave Halter
parent 68c6f8dd03
commit fc27ca1b6a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jedi/evaluate/compiled/__init__.py
View File

@@ -346,7 +346,7 @@ class CompiledObjectFilter(AbstractFilter):
is_instance = self._is_instance or fake.is_class_instance(obj) is_instance = self._is_instance or fake.is_class_instance(obj)
# ``dir`` doesn't include the type names. # ``dir`` doesn't include the type names.
if not inspect.ismodule(obj) and obj != type and not is_instance: if not inspect.ismodule(obj) and (obj is not type) and not is_instance:
for filter in create(self._evaluator, type).get_filters(): for filter in create(self._evaluator, type).get_filters():
names += filter.values() names += filter.values()
return names return names

4
jedi/evaluate/compiled/fake.py
View File

@@ -132,7 +132,7 @@ def _faked(module, obj, name):
return None, None return None, None
return _search_scope(cls, obj.__name__), faked_mod return _search_scope(cls, obj.__name__), faked_mod
else: else:
if obj == module: if obj is module:
return _search_scope(faked_mod, name), faked_mod return _search_scope(faked_mod, name), faked_mod
else: else:
try: try:
@@ -156,7 +156,7 @@ def memoize_faked(obj):
key = (obj, args, frozenset(kwargs.items())) key = (obj, args, frozenset(kwargs.items()))
try: try:
result = cache[key] result = cache[key]
except TypeError: except (TypeError, ValueError):
return obj(*args, **kwargs) return obj(*args, **kwargs)
except KeyError: except KeyError:
result = obj(*args, **kwargs) result = obj(*args, **kwargs)