Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-08 09:32:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.9] bpo-45679: Fix caching of multi-value typing.Literal (GH-29334) (GH-29342)

Browse source 
Literal[True, 2] is no longer equal to Literal[1, 2]..
(cherry picked from commit 634984d7db)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
Serhiy Storchaka 2021-11-03 11:28:55 +02:00 • committed by GitHub
parent 5f527caf15
commit bbcf06bf95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_typing.py
View file

@ -562,6 +562,8 @@ def test_equal(self):
self.assertNotEqual(Literal[True], Literal[1]) self.assertNotEqual(Literal[True], Literal[1])
self.assertNotEqual(Literal[1], Literal[2]) self.assertNotEqual(Literal[1], Literal[2])
self.assertNotEqual(Literal[1, True], Literal[1]) self.assertNotEqual(Literal[1, True], Literal[1])
self.assertNotEqual(Literal[1, True], Literal[1, 1])
self.assertNotEqual(Literal[1, 2], Literal[True, 2])
self.assertEqual(Literal[1], Literal[1]) self.assertEqual(Literal[1], Literal[1])
self.assertEqual(Literal[1, 2], Literal[2, 1]) self.assertEqual(Literal[1, 2], Literal[2, 1])
self.assertEqual(Literal[1, 2, 3], Literal[1, 2, 3, 3]) self.assertEqual(Literal[1, 2, 3], Literal[1, 2, 3, 3])

11
Lib/typing.py
View file

@ -355,9 +355,10 @@ def __getitem__(self, parameters):
class _LiteralSpecialForm(_SpecialForm, _root=True): class _LiteralSpecialForm(_SpecialForm, _root=True):
@_tp_cache(typed=True)
def __getitem__(self, parameters): def __getitem__(self, parameters):
return self._getitem(self, parameters) if not isinstance(parameters, tuple):
parameters = (parameters,)
return self._getitem(self, *parameters)
@_SpecialForm @_SpecialForm
@ -478,7 +479,8 @@ def Optional(self, parameters):
return Union[arg, type(None)] return Union[arg, type(None)]
@_LiteralSpecialForm @_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). """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 This form can be used to indicate to type checkers that the corresponding
@ -501,9 +503,6 @@ def open_helper(file: str, mode: MODE) -> str:
""" """
# There is no '_type_check' call because arguments to Literal[...] are # There is no '_type_check' call because arguments to Literal[...] are
# values, not types. # values, not types.
if not isinstance(parameters, tuple):
parameters = (parameters,)
parameters = _flatten_literal_params(parameters) parameters = _flatten_literal_params(parameters)
try: try:

2
Misc/NEWS.d/next/Library/2021-10-30-21-11-37.bpo-45679.Dq8Cpu.rst Normal file
View file

@ -0,0 +1,2 @@
Fix caching of multi-value :data:`typing.Literal`. ``Literal[True, 2]`` is no
longer equal to ``Literal[1, 2]``.