Rename argument to strict_optional

Author: cdce8p

mypy/expandtype.py

@@ -54,7 +54,7 @@ def expand_type(
     env: Mapping[TypeVarId, Type],
     allow_erased_callables: bool = ...,
     *,
-    keep_none_type: bool = ...,
+    strict_optional: bool = ...,
 ) -> ProperType:
     ...
 
@@ -65,7 +65,7 @@ def expand_type(
     env: Mapping[TypeVarId, Type],
     allow_erased_callables: bool = ...,
     *,
-    keep_none_type: bool = ...,
+    strict_optional: bool = ...,
 ) -> Type:
     ...
 
@@ -75,12 +75,12 @@ def expand_type(
     env: Mapping[TypeVarId, Type],
     allow_erased_callables: bool = False,
     *,
-    keep_none_type: bool = False,
+    strict_optional: bool = False,
 ) -> Type:
     """Substitute any type variable references in a type given by a type
     environment.
     """
-    return typ.accept(ExpandTypeVisitor(env, allow_erased_callables, keep_none_type))
+    return typ.accept(ExpandTypeVisitor(env, allow_erased_callables, strict_optional))
 
 
 @overload
@@ -198,11 +198,11 @@ def __init__(
         self,
         variables: Mapping[TypeVarId, Type],
         allow_erased_callables: bool = False,
-        keep_none_type: bool = False,
+        strict_optional: bool = False,
     ) -> None:
         self.variables = variables
         self.allow_erased_callables = allow_erased_callables
-        self.keep_none_type = keep_none_type
+        self.strict_optional = strict_optional
         self.recursive_guard: set[Type | tuple[int, Type]] = set()
 
     def visit_unbound_type(self, t: UnboundType) -> Type:
@@ -486,7 +486,7 @@ def visit_union_type(self, t: UnionType) -> Type:
         # might be subtypes of others, however calling  make_simplified_union()
         # can cause recursion, so we just remove strict duplicates.
         return UnionType.make_union(
-            remove_trivial(flatten_nested_unions(expanded), self.keep_none_type), t.line, t.column
+            remove_trivial(flatten_nested_unions(expanded), self.strict_optional), t.line, t.column
         )
 
     def visit_partial_type(self, t: PartialType) -> Type:

mypy/typeanal.py

@@ -1692,7 +1692,7 @@ def fix_instance(
             args.append(arg)
         env[tv.id] = arg
     t.args = tuple(args)
-    fixed = expand_type(t, env, keep_none_type=True)
+    fixed = expand_type(t, env, strict_optional=True)
     assert isinstance(fixed, Instance)
     t.args = fixed.args
 

mypy/types.py

@@ -3679,7 +3679,7 @@ def store_argument_type(
     defn.arguments[i].variable.type = arg_type
 
 
-def remove_trivial(types: Iterable[Type], keep_none_type: bool = False) -> list[Type]:
+def remove_trivial(types: Iterable[Type], strict_optional: bool = False) -> list[Type]:
     """Make trivial simplifications on a list of types without calling is_subtype().
 
     This makes following simplifications:
@@ -3694,7 +3694,7 @@ def remove_trivial(types: Iterable[Type], keep_none_type: bool = False) -> list[
         p_t = get_proper_type(t)
         if isinstance(p_t, UninhabitedType):
             continue
-        if isinstance(p_t, NoneType) and not state.strict_optional and not keep_none_type:
+        if isinstance(p_t, NoneType) and not state.strict_optional and not strict_optional:
             removed_none = True
             continue
         if isinstance(p_t, Instance) and p_t.type.fullname == "builtins.object":