Skip to content

bpo-43224: Draft implementation of PEP 646 #30398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 18 commits into from
Closed

bpo-43224: Draft implementation of PEP 646 #30398

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
64abc0a
PEP 646: Grammar and compiler changes
mrahtz Dec 3, 2021
b725671
PEP 646: Add tests for syntax changes
mrahtz Jan 3, 2022
ea329b9
PEP 646: Add AST tests for *args annotations
mrahtz Dec 7, 2021
681dc4e
PEP 646: Add AST tests for return types with unpacking
mrahtz Dec 7, 2021
69f575f
PEP 646: Add AST tests for variable annotations with unpacking
mrahtz Dec 7, 2021
095a620
PEP 646: Add support for starring tuple types
mrahtz Jan 2, 2022
6713748
PEP 646: Add tests for starring tuple types
mrahtz Jan 2, 2022
038b8f0
PEP 646: Implement support in typing.py
mrahtz Jan 2, 2022
f028339
PEP 646: Add tests for everything in typing.py
mrahtz Jan 2, 2022
38c17d3
PEP 646: Add tests for typing.get_{origin,args}
mrahtz Jan 4, 2022
9991937
PEP 646: Various fixes to genericaliasobject.c
mrahtz Jan 15, 2022
9017d22
PEP 646: Fix test_pep646_syntax import
mrahtz Jan 15, 2022
07ed599
PEP 646: Add docstring for TypeVarTuple
mrahtz Jan 17, 2022
74e5252
PEP 646: Swap a Py_INCREF with a Py_NewRef
mrahtz Jan 20, 2022
6cb3aa5
PEP 646: Add test for assigning to a slice containing a star
mrahtz Jan 20, 2022
daef59b
📜🤖 Added by blurb_it.
blurb-it[bot] Jan 20, 2022
3c2a7e7
PEP 646: Add line to Doc/whatsnew
mrahtz Jan 20, 2022
456156a
PEP 646: Use stdbool.h; separate test cases
mrahtz Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
PEP 646: Add tests for typing.get_{origin,args} 
and fix a couple of bugs the tests revealed
  • Loading branch information
@mrahtz
mrahtz committed Jan 4, 2022
commit 38c17d3d6143f904f5429e938371b200a631f3ef
58 changes: 58 additions & 0 deletions Lib/test/test_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3965,10 +3965,15 @@ def test_top_level_class_var(self):
class GetUtilitiesTestCase(TestCase):
def test_get_origin(self):
T = TypeVar('T')
Ts = TypeVarTuple('Ts')
P = ParamSpec('P')
class C(Generic[T]): pass
self.assertIs(get_origin(C[int]), C)
self.assertIs(get_origin(C[T]), C)
class D(Generic[*Ts]): pass
self.assertIs(get_origin(D[int]), D)
self.assertIs(get_origin(D[T]), D)
self.assertIs(get_origin(D[*Ts]), D)
self.assertIs(get_origin(int), None)
self.assertIs(get_origin(ClassVar[int]), ClassVar)
self.assertIs(get_origin(Union[int, str]), Union)
Expand All @@ -3980,6 +3985,17 @@ class C(Generic[T]): pass
self.assertIs(get_origin(Annotated[T, 'thing']), Annotated)
self.assertIs(get_origin(List), list)
self.assertIs(get_origin(Tuple), tuple)

self.assertIs(get_origin(tuple[*Ts]), tuple)
self.assertIs(get_origin(tuple[Unpack[Ts]]), tuple)
self.assertIs(get_origin(Tuple[*Ts]), tuple)
self.assertIs(get_origin(Tuple[Unpack[Ts]]), tuple)

self.assertIs(get_origin((*tuple[int],)[0]), tuple)
self.assertIs(get_origin(Unpack[tuple[int]]), tuple)
self.assertIs(get_origin((*Tuple[int],)[0]), tuple)
self.assertIs(get_origin(Unpack[Tuple[int]]), tuple)

self.assertIs(get_origin(Callable), collections.abc.Callable)
self.assertIs(get_origin(list[int]), list)
self.assertIs(get_origin(list), None)
Expand All @@ -3989,9 +4005,17 @@ class C(Generic[T]): pass

def test_get_args(self):
T = TypeVar('T')
Ts = TypeVarTuple('Ts')
class C(Generic[T]): pass
self.assertEqual(get_args(C[int]), (int,))
self.assertEqual(get_args(C[T]), (T,))
class D(Generic[*Ts]): pass
self.assertEqual(get_args(D[int]), (int,))
self.assertEqual(get_args(D[T]), (T,))
self.assertEqual(get_args(D[*Ts]), (*Ts,))
self.assertEqual(get_args(D[T, *Ts]), (T, *Ts,))
self.assertEqual(get_args(D[*Ts, T]), (*Ts, T))
self.assertEqual(get_args(D[*Ts, int, ...]), (*Ts, int, ...))
self.assertEqual(get_args(int), ())
self.assertEqual(get_args(ClassVar[int]), (int,))
self.assertEqual(get_args(Union[int, str]), (int, str))
Expand All @@ -4007,6 +4031,40 @@ class C(Generic[T]): pass
(int, Callable[[Tuple[T, ...]], str]))
self.assertEqual(get_args(Tuple[int, ...]), (int, ...))
self.assertEqual(get_args(Tuple[()]), ((),))

self.assertEqual(get_args(tuple[*Ts]), (*Ts,))
self.assertEqual(get_args(tuple[Unpack[Ts]]), (Unpack[Ts],))
self.assertEqual(get_args(Tuple[*Ts]), (*Ts,))
self.assertEqual(get_args(Tuple[Unpack[Ts]]), (Unpack[Ts],))

self.assertEqual(get_args(tuple[*Ts, int]), (*Ts, int))
self.assertEqual(get_args(tuple[Unpack[Ts], int]), (Unpack[Ts], int))
self.assertEqual(get_args(Tuple[*Ts, int]), (*Ts, int))
self.assertEqual(get_args(Tuple[Unpack[Ts], int]), (Unpack[Ts], int))

self.assertEqual(get_args(tuple[int, *Ts]), (int, *Ts))
self.assertEqual(get_args(tuple[int, Unpack[Ts]]), (int, Unpack[Ts]))
self.assertEqual(get_args(Tuple[int, *Ts]), (int, *Ts))
self.assertEqual(get_args(Tuple[int, Unpack[Ts]]), (int, Unpack[Ts]))

self.assertEqual(get_args(tuple[int, *Ts, str]),
(int, *Ts, str))
self.assertEqual(get_args(tuple[int, Unpack[Ts], str]),
(int, Unpack[Ts], str))
self.assertEqual(get_args(Tuple[int, *Ts, str]),
(int, *Ts, str))
self.assertEqual(get_args(Tuple[int, Unpack[Ts], str]),
(int, Unpack[Ts], str))

self.assertEqual(get_args(tuple[*Ts, int, ...]),
(*Ts, int, ...))
self.assertEqual(get_args(tuple[Unpack[Ts], int, ...]),
(Unpack[Ts], int, ...))
self.assertEqual(get_args(Tuple[*Ts, int, ...]),
(*Ts, int, ...))
self.assertEqual(get_args(Tuple[Unpack[Ts]]),
(Unpack[Ts],))

self.assertEqual(get_args(Annotated[T, 'one', 2, ['three']]), (T, 'one', 2, ['three']))
self.assertEqual(get_args(List), ())
self.assertEqual(get_args(Tuple), ())
Expand Down
9 changes: 5 additions & 4 deletions Lib/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,6 +911,7 @@ class StarredTuple(_Final, _Immutable, _root=True):
"""

def __init__(self, tup):
self.__origin__ = tuple
self._tuple = tup
self.__args__ = tup.__args__
self.__parameters__ = tup.__parameters__
Expand Down Expand Up @@ -1470,10 +1471,10 @@ def __getitem__(self, params):
return self.copy_with((_TypingEmpty,))
if not isinstance(params, tuple):
params = (params,)
if len(params) == 2 and params[1] is ...:
if len(params) >= 2 and params[-1] is ...:
msg = "Tuple[t, ...]: t must be a type."
p = _type_check(params[0], msg)
return self.copy_with((p, _TypingEllipsis))
params = tuple(_type_check(p, msg) for p in params[:-1])
return self.copy_with((*params, _TypingEllipsis))
msg = "Tuple[t0, t1, ...]: each t must be a type."
params = tuple(_type_check(p, msg) for p in params)
return self.copy_with(params)
Expand Down Expand Up @@ -2178,7 +2179,7 @@ def get_origin(tp):
if isinstance(tp, _AnnotatedAlias):
return Annotated
if isinstance(tp, (_BaseGenericAlias, GenericAlias,
ParamSpecArgs, ParamSpecKwargs)):
ParamSpecArgs, ParamSpecKwargs, StarredTuple)):
return tp.__origin__
if tp is Generic:
return Generic
Expand Down