update meet to return UninhabitedType() in the case of a None + Uninhabited Type Meet

update join to return AnyType in the case of NoneType + AnyType

Author: MechanicalConstruct

mypy/join.py

@@ -317,7 +317,7 @@ def visit_none_type(self, t: NoneType) -> ProperType:
         if state.strict_optional:
             if isinstance(self.s, (NoneType, UninhabitedType)):
                 return t
-            elif isinstance(self.s, UnboundType):
+            elif isinstance(self.s, (UnboundType, AnyType)):
                 return AnyType(TypeOfAny.special_form)
             else:
                 return mypy.typeops.make_simplified_union([self.s, t])

mypy/meet.py

@@ -691,7 +691,7 @@ def __init__(self, s: ProperType) -> None:
     def visit_unbound_type(self, t: UnboundType) -> ProperType:
         if isinstance(self.s, NoneType):
             if state.strict_optional:
-                return AnyType(TypeOfAny.special_form)
+                return UninhabitedType()
             else:
                 return self.s
         elif isinstance(self.s, UninhabitedType):