From 1df8d5baa56164cc08d0c224474693c6d5af981a Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Date: Tue, 23 Apr 2013 18:29:43 +0400
Subject: [PATCH] Pass 'inherited' resolve flag to PyType ancestors

---
 .../com/jetbrains/python/psi/types/PyImportedModuleType.java    | 2 +-
 python/src/com/jetbrains/python/psi/types/PyUnionType.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/src/com/jetbrains/python/psi/types/PyImportedModuleType.java b/python/src/com/jetbrains/python/psi/types/PyImportedModuleType.java
index cfa0d325d2a6..90edfdffd197 100644
--- a/python/src/com/jetbrains/python/psi/types/PyImportedModuleType.java
+++ b/python/src/com/jetbrains/python/psi/types/PyImportedModuleType.java
@@ -42,7 +42,7 @@ public class PyImportedModuleType implements PyType {
     final PsiElement resolved = myImportedModule.resolve();
     if (resolved instanceof PyFile) {
       final PyFile file = (PyFile)resolved;
-      return new PyModuleType(file, myImportedModule).resolveMember(name, location, direction, resolveContext, true);
+      return new PyModuleType(file, myImportedModule).resolveMember(name, location, direction, resolveContext, inherited);
     }
     else if (resolved instanceof PsiDirectory) {
       final List<PsiElement> elements = Collections.singletonList(ResolveImportUtil.resolveChild(resolved, name, null, true, true));
diff --git a/python/src/com/jetbrains/python/psi/types/PyUnionType.java b/python/src/com/jetbrains/python/psi/types/PyUnionType.java
index ca774a21f61a..01d5ab3e7b86 100644
--- a/python/src/com/jetbrains/python/psi/types/PyUnionType.java
+++ b/python/src/com/jetbrains/python/psi/types/PyUnionType.java
@@ -32,7 +32,7 @@ public class PyUnionType implements PyType {
     boolean all_nulls = true;
     for (PyType member : myMembers) {
       if (member != null) {
-        List<? extends RatedResolveResult> result = member.resolveMember(name, null, direction, resolveContext, true);
+        List<? extends RatedResolveResult> result = member.resolveMember(name, null, direction, resolveContext, inherited);
         if (result != null) {
           all_nulls = false;
           ret.addAll(result);