more changes

Author: hauntsaninja

mypy/typeops.py

@@ -200,7 +200,12 @@ def class_callable(
             # annotations on __new__ that hardcode the class in the return type.
             # This can then cause problems for subclasses. Preserve the old behaviour in
             # this case (although we should probably change it at some point)
-            if not is_subtype(default_ret_type, explicit_type, ignore_type_params=True):
+            # See testValueTypeWithNewInParentClass
+            # Also see testSelfTypeInGenericClassUsedFromAnotherGenericClass1
+            if (
+                not is_subtype(default_ret_type, explicit_type, ignore_type_params=True)
+                or is_subtype(explicit_type, default_ret_type, ignore_type_params=True)
+            ):
                 ret_type = explicit_type
         elif (
             # We have to skip protocols, because it can be a subtype of a return type

test-data/unit/check-classes.test

@@ -6913,8 +6913,8 @@ class O(Generic[T]):
     def __new__(cls, x: int = 0) -> O[Any]:
         pass
 
-reveal_type(O())  # N: Revealed type is "__main__.O[Never]"
-reveal_type(O(10))  # N: Revealed type is "__main__.O[Never]"
+reveal_type(O())  # N: Revealed type is "__main__.O[builtins.int]"
+reveal_type(O(10))  # N: Revealed type is "__main__.O[builtins.str]"
 
 [case testNewReturnType6]
 from typing import Tuple, Optional