bpo-45679: Fix caching of multi-value typing.Literal (GH-29334)
Literal[True, 2] is no longer equal to Literal[1, 2].
(cherry picked from commit 634984d7dbdd91e0a51a793eed4d870e139ae1e0)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
diff --git a/Lib/typing.py b/Lib/typing.py
index f842fc2..21caabb 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -403,9 +403,10 @@ def __getitem__(self, parameters):
class _LiteralSpecialForm(_SpecialForm, _root=True):
- @_tp_cache(typed=True)
def __getitem__(self, parameters):
- return self._getitem(self, parameters)
+ if not isinstance(parameters, tuple):
+ parameters = (parameters,)
+ return self._getitem(self, *parameters)
@_SpecialForm
@@ -528,7 +529,8 @@ def Optional(self, parameters):
return Union[arg, type(None)]
@_LiteralSpecialForm
-def Literal(self, parameters):
+@_tp_cache(typed=True)
+def Literal(self, *parameters):
"""Special typing form to define literal types (a.k.a. value types).
This form can be used to indicate to type checkers that the corresponding
@@ -551,9 +553,6 @@ def open_helper(file: str, mode: MODE) -> str:
"""
# There is no '_type_check' call because arguments to Literal[...] are
# values, not types.
- if not isinstance(parameters, tuple):
- parameters = (parameters,)
-
parameters = _flatten_literal_params(parameters)
try: