Skip to content

Commit

Permalink
bpo-46981: Remove typing._TypingEmpty (GH-31836)
Browse files Browse the repository at this point in the history
* get_args(Tuple[()]) now returns () instead of ((),).
* Tuple[Unpack[Ts]][()] now returns the result equal to Tuple[()].
  • Loading branch information
serhiy-storchaka committed Mar 17, 2022
1 parent 4674fd4 commit 15df8f8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 15 deletions.
8 changes: 3 additions & 5 deletions Lib/test/test_typing.py
Expand Up @@ -469,14 +469,12 @@ class G(Generic[Unpack[Ts]]): pass

for A in G, Tuple:
B = A[Unpack[Ts]]
if A != Tuple:
self.assertEqual(B[()], A[()])
self.assertEqual(B[()], A[()])
self.assertEqual(B[float], A[float])
self.assertEqual(B[float, str], A[float, str])

C = List[A[Unpack[Ts]]]
if A != Tuple:
self.assertEqual(C[()], List[A[()]])
self.assertEqual(C[()], List[A[()]])
self.assertEqual(C[float], List[A[float]])
self.assertEqual(C[float, str], List[A[float, str]])

Expand Down Expand Up @@ -4248,7 +4246,7 @@ class C(Generic[T]): pass
self.assertEqual(get_args(Union[int, Callable[[Tuple[T, ...]], str]]),
(int, Callable[[Tuple[T, ...]], str]))
self.assertEqual(get_args(Tuple[int, ...]), (int, ...))
self.assertEqual(get_args(Tuple[()]), ((),))
self.assertEqual(get_args(Tuple[()]), ())
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
10 changes: 0 additions & 10 deletions Lib/typing.py
Expand Up @@ -1220,7 +1220,6 @@ def __init__(self, origin, args, *, inst=True, name=None,
if not isinstance(args, tuple):
args = (args,)
self.__args__ = tuple(... if a is _TypingEllipsis else
() if a is _TypingEmpty else
a for a in args)
self.__parameters__ = _collect_parameters(args)
self._paramspec_tvars = _paramspec_tvars
Expand Down Expand Up @@ -1503,8 +1502,6 @@ def __getitem_inner__(self, params):
class _TupleType(_SpecialGenericAlias, _root=True):
@_tp_cache
def __getitem__(self, params):
if params == ():
return self.copy_with((_TypingEmpty,))
if not isinstance(params, tuple):
params = (params,)
if len(params) >= 2 and params[-1] is ...:
Expand Down Expand Up @@ -1735,13 +1732,6 @@ def __init_subclass__(cls, *args, **kwargs):
cls.__parameters__ = tuple(tvars)


class _TypingEmpty:
"""Internal placeholder for () or []. Used by TupleMeta and CallableMeta
to allow empty list/tuple in specific places, without allowing them
to sneak in where prohibited.
"""


class _TypingEllipsis:
"""Internal placeholder for ... (ellipsis)."""

Expand Down
@@ -0,0 +1,2 @@
``typing.get_args(typing.Tuple[()])`` now returns ``()`` instead of
``((),)``.

0 comments on commit 15df8f8

Please sign in to comment.