mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[3.12] test_types: Replace raw assert statements (GH-105500) (#105507)

Browse source 
(cherry picked from commit a8eb7372ee)

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
This commit is contained in:
Miss Islington (bot) 2023-06-08 08:19:11 -07:00 • committed by GitHub
parent 3c5f0eadd8
commit 1f90b2f57a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Lib/test/test_types.py
View file

@ -226,8 +226,8 @@ class TypesTests(unittest.TestCase):
def test_int__format__(self): def test_int__format__(self):
def test(i, format_spec, result): def test(i, format_spec, result):
# just make sure we have the unified type for integers # just make sure we have the unified type for integers
assert type(i) == int self.assertIs(type(i), int)
assert type(format_spec) == str self.assertIs(type(format_spec), str)
self.assertEqual(i.__format__(format_spec), result) self.assertEqual(i.__format__(format_spec), result)
test(123456789, 'd', '123456789') test(123456789, 'd', '123456789')
@ -782,8 +782,8 @@ class UnionTests(unittest.TestCase):
def test_or_type_operator_with_TypeVar(self): def test_or_type_operator_with_TypeVar(self):
TV = typing.TypeVar('T') TV = typing.TypeVar('T')
assert TV | str == typing.Union[TV, str] self.assertEqual(TV | str, typing.Union[TV, str])
assert str | TV == typing.Union[str, TV] self.assertEqual(str | TV, typing.Union[str, TV])
self.assertIs((int | TV)[int], int) self.assertIs((int | TV)[int], int)
self.assertIs((TV | int)[int], int) self.assertIs((TV | int)[int], int)
@ -887,43 +887,45 @@ class UnionTests(unittest.TestCase):
ForwardBefore = 'Forward' | T ForwardBefore = 'Forward' | T
def forward_after(x: ForwardAfter[int]) -> None: ... def forward_after(x: ForwardAfter[int]) -> None: ...
def forward_before(x: ForwardBefore[int]) -> None: ... def forward_before(x: ForwardBefore[int]) -> None: ...
assert typing.get_args(typing.get_type_hints(forward_after)['x']) == (int, Forward) self.assertEqual(typing.get_args(typing.get_type_hints(forward_after)['x']),
assert typing.get_args(typing.get_type_hints(forward_before)['x']) == (int, Forward) (int, Forward))
self.assertEqual(typing.get_args(typing.get_type_hints(forward_before)['x']),
(int, Forward))
def test_or_type_operator_with_Protocol(self): def test_or_type_operator_with_Protocol(self):
class Proto(typing.Protocol): class Proto(typing.Protocol):
def meth(self) -> int: def meth(self) -> int:
... ...
assert Proto | str == typing.Union[Proto, str] self.assertEqual(Proto | str, typing.Union[Proto, str])
def test_or_type_operator_with_Alias(self): def test_or_type_operator_with_Alias(self):
assert list | str == typing.Union[list, str] self.assertEqual(list | str, typing.Union[list, str])
assert typing.List | str == typing.Union[typing.List, str] self.assertEqual(typing.List | str, typing.Union[typing.List, str])
def test_or_type_operator_with_NamedTuple(self): def test_or_type_operator_with_NamedTuple(self):
NT=namedtuple('A', ['B', 'C', 'D']) NT = namedtuple('A', ['B', 'C', 'D'])
assert NT | str == typing.Union[NT,str] self.assertEqual(NT | str, typing.Union[NT, str])
def test_or_type_operator_with_TypedDict(self): def test_or_type_operator_with_TypedDict(self):
class Point2D(typing.TypedDict): class Point2D(typing.TypedDict):
x: int x: int
y: int y: int
label: str label: str
assert Point2D | str == typing.Union[Point2D, str] self.assertEqual(Point2D | str, typing.Union[Point2D, str])
def test_or_type_operator_with_NewType(self): def test_or_type_operator_with_NewType(self):
UserId = typing.NewType('UserId', int) UserId = typing.NewType('UserId', int)
assert UserId | str == typing.Union[UserId, str] self.assertEqual(UserId | str, typing.Union[UserId, str])
def test_or_type_operator_with_IO(self): def test_or_type_operator_with_IO(self):
assert typing.IO | str == typing.Union[typing.IO, str] self.assertEqual(typing.IO | str, typing.Union[typing.IO, str])
def test_or_type_operator_with_SpecialForm(self): def test_or_type_operator_with_SpecialForm(self):
assert typing.Any | str == typing.Union[typing.Any, str] self.assertEqual(typing.Any | str, typing.Union[typing.Any, str])
assert typing.NoReturn | str == typing.Union[typing.NoReturn, str] self.assertEqual(typing.NoReturn | str, typing.Union[typing.NoReturn, str])
assert typing.Optional[int] | str == typing.Union[typing.Optional[int], str] self.assertEqual(typing.Optional[int] | str, typing.Union[typing.Optional[int], str])
assert typing.Optional[int] | str == typing.Union[int, str, None] self.assertEqual(typing.Optional[int] | str, typing.Union[int, str, None])
assert typing.Union[int, bool] | str == typing.Union[int, bool, str] self.assertEqual(typing.Union[int, bool] | str, typing.Union[int, bool, str])
def test_or_type_operator_with_Literal(self): def test_or_type_operator_with_Literal(self):
Literal = typing.Literal Literal = typing.Literal
@ -955,12 +957,12 @@ class UnionTests(unittest.TestCase):
(Literal[1], Literal[Ints.B])) (Literal[1], Literal[Ints.B]))
def test_or_type_repr(self): def test_or_type_repr(self):
assert repr(int | str) == "int | str" self.assertEqual(repr(int | str), "int | str")
assert repr((int | str) | list) == "int | str | list" self.assertEqual(repr((int | str) | list), "int | str | list")
assert repr(int | (str | list)) == "int | str | list" self.assertEqual(repr(int | (str | list)), "int | str | list")
assert repr(int | None) == "int | None" self.assertEqual(repr(int | None), "int | None")
assert repr(int | type(None)) == "int | None" self.assertEqual(repr(int | type(None)), "int | None")
assert repr(int | typing.GenericAlias(list, int)) == "int | list[int]" self.assertEqual(repr(int | typing.GenericAlias(list, int)), "int | list[int]")
def test_or_type_operator_with_genericalias(self): def test_or_type_operator_with_genericalias(self):
a = list[int] a = list[int]