From aa9057be3864e20be6df07af1815ae43edff9f26 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Thu, 4 Dec 2014 02:01:30 +0100 Subject: [PATCH] Small fix for builtins. --- jedi/evaluate/compiled/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jedi/evaluate/compiled/__init__.py b/jedi/evaluate/compiled/__init__.py index fd758606..6a381f74 100644 --- a/jedi/evaluate/compiled/__init__.py +++ b/jedi/evaluate/compiled/__init__.py @@ -65,7 +65,7 @@ class CompiledObject(Base): @CheckAttribute def py__mro__(self, evaluator): - return tuple(create(evaluator, cls) for cls in self.obj.__mro__) + return tuple(create(evaluator, cls, self.parent) for cls in self.obj.__mro__) @CheckAttribute def py__bases__(self, evaluator): @@ -489,7 +489,7 @@ def create(evaluator, obj, parent=builtin, module=None): return faked try: - if obj.__module__ in ('builtins', '__builtin__'): + if parent == builtin and obj.__module__ in ('builtins', '__builtin__'): return builtin.get_by_name(obj.__name__) except AttributeError: pass