From ae574867acdcd8b82cdce2d233e522a2b6187c95 Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Date: Thu, 25 Apr 2013 17:34:56 +0400
Subject: [PATCH] Fixed regression in resolving 'namedtuple' members

---
 .../python/codeInsight/stdlib/PyNamedTupleType.java         | 6 ++++--
 .../python/psi/impl/references/PyQualifiedReference.java    | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/python/src/com/jetbrains/python/codeInsight/stdlib/PyNamedTupleType.java b/python/src/com/jetbrains/python/codeInsight/stdlib/PyNamedTupleType.java
index 857e09334a41..6d211e964557 100644
--- a/python/src/com/jetbrains/python/codeInsight/stdlib/PyNamedTupleType.java
+++ b/python/src/com/jetbrains/python/codeInsight/stdlib/PyNamedTupleType.java
@@ -41,12 +41,14 @@ public class PyNamedTupleType extends PyClassTypeImpl implements PyCallableType
     myDefinitionLevel = definitionLevel;
   }
 
+  @Nullable
   @Override
   public List<? extends RatedResolveResult> resolveMember(@NotNull String name,
                                                           @Nullable PyExpression location,
                                                           @NotNull AccessDirection direction,
-                                                          @NotNull PyResolveContext resolveContext) {
-    final List<? extends RatedResolveResult> classMembers = super.resolveMember(name, location, direction, resolveContext);
+                                                          @NotNull PyResolveContext resolveContext,
+                                                          boolean inherited) {
+    final List<? extends RatedResolveResult> classMembers = super.resolveMember(name, location, direction, resolveContext, inherited);
     if (classMembers != null && !classMembers.isEmpty()) {
       return classMembers;
     }
diff --git a/python/src/com/jetbrains/python/psi/impl/references/PyQualifiedReference.java b/python/src/com/jetbrains/python/psi/impl/references/PyQualifiedReference.java
index 38a79b0399b9..0673d098cdcc 100644
--- a/python/src/com/jetbrains/python/psi/impl/references/PyQualifiedReference.java
+++ b/python/src/com/jetbrains/python/psi/impl/references/PyQualifiedReference.java
@@ -71,8 +71,7 @@ public class PyQualifiedReference extends PyReferenceImpl {
       qualifierType.assertValid("qualifier: " + qualifier);
       // resolve within the type proper
       AccessDirection ctx = AccessDirection.of(myElement);
-      final List<? extends RatedResolveResult> membersOfQualifier = qualifierType.resolveMember(referencedName, qualifier, ctx, myContext
-      );
+      final List<? extends RatedResolveResult> membersOfQualifier = qualifierType.resolveMember(referencedName, qualifier, ctx, myContext);
       if (membersOfQualifier == null) {
         return ret; // qualifier is positive that such name cannot exist in it
       }