Revert "Fixed a bug that led to a false negative when determining whether two base classes that are combined using multiple inheritance implement the same method in an incompatible way. The bug caused the check to be skipped if the child class also implemented the same method as the two base classes. This addresses python/mypy#15790. (#5617)"

This reverts commit fb56dcc.

Author: msfterictraut

Diff for: packages/pyright-internal/src/analyzer/checker.ts

@@ -5177,7 +5177,7 @@ export class Checker extends ParseTreeWalker {
             return getClassFieldsRecursive(specializedBaseClass);
         });
 
-        const childClassSymbolMap = getClassFieldsRecursive(classType, /* skipInitialClass */ true);
+        const childClassSymbolMap = getClassFieldsRecursive(classType);
 
         for (let symbolMapBaseIndex = 1; symbolMapBaseIndex < baseClassSymbolMaps.length; symbolMapBaseIndex++) {
             const baseSymbolMap = baseClassSymbolMaps[symbolMapBaseIndex];

Diff for: packages/pyright-internal/src/analyzer/typeUtils.ts

@@ -1464,15 +1464,11 @@ export function* getClassIterator(classType: Type, flags = ClassIteratorFlags.De
     return undefined;
 }
 
-export function getClassFieldsRecursive(classType: ClassType, skipInitialClass = false): Map<string, ClassMember> {
+export function getClassFieldsRecursive(classType: ClassType): Map<string, ClassMember> {
     const memberMap = new Map<string, ClassMember>();
 
     // Evaluate the types of members from the end of the MRO to the beginning.
     ClassType.getReverseMro(classType).forEach((mroClass) => {
-        if (skipInitialClass && isClass(mroClass) && ClassType.isSameGenericClass(mroClass, classType)) {
-            return;
-        }
-
         const specializedMroClass = partiallySpecializeType(mroClass, classType);
 
         if (isClass(specializedMroClass)) {

Diff for: packages/pyright-internal/src/tests/samples/methodOverride3.py

@@ -2,7 +2,8 @@
 # This functionality is controlled by the reportIncompatibleMethodOverride
 # diagnostic rule.
 
-from typing import Any, Generic, Iterable, ParamSpec, TypeVar
+
+from typing import Generic, Iterable, ParamSpec, TypeVar
 
 
 class A1:
@@ -17,8 +18,7 @@ def func1(self, a: int, b: int = 3) -> str:
 
 # This should generate an error because func1 is incompatible.
 class ASub(A1, A2):
-    def func1(self, *args: Any, **kwargs: Any) -> str:
-        ...
+    ...
 
 
 class B1: