From fc27ca1b6ada9ac9f70fd38a4f7f803b40d1572e Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Thu, 23 Feb 2017 15:29:23 -0800 Subject: [PATCH] 'fix a couple of error locations' --- jedi/evaluate/compiled/__init__.py | 2 +- jedi/evaluate/compiled/fake.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jedi/evaluate/compiled/__init__.py b/jedi/evaluate/compiled/__init__.py index 131c9598..b524fe10 100644 --- a/jedi/evaluate/compiled/__init__.py +++ b/jedi/evaluate/compiled/__init__.py @@ -346,7 +346,7 @@ class CompiledObjectFilter(AbstractFilter): is_instance = self._is_instance or fake.is_class_instance(obj) # ``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(): names += filter.values() return names diff --git a/jedi/evaluate/compiled/fake.py b/jedi/evaluate/compiled/fake.py index 47332703..607c0053 100644 --- a/jedi/evaluate/compiled/fake.py +++ b/jedi/evaluate/compiled/fake.py @@ -132,7 +132,7 @@ def _faked(module, obj, name): return None, None return _search_scope(cls, obj.__name__), faked_mod else: - if obj == module: + if obj is module: return _search_scope(faked_mod, name), faked_mod else: try: @@ -156,7 +156,7 @@ def memoize_faked(obj): key = (obj, args, frozenset(kwargs.items())) try: result = cache[key] - except TypeError: + except (TypeError, ValueError): return obj(*args, **kwargs) except KeyError: result = obj(*args, **kwargs)