GeezerVison is showing github.com — bpo-40398: Fix typing.get_args() for special generic aliases. (GH-19720) · serhiy-storchaka/cpython@6292be7
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: Lib/test/test_typing.py +7-2Lines changed: 7 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -3007,6 +3007,8 @@ class C(Generic[T]): pass | 3007 | 3007 | self.assertIs(get_origin(List[Tuple[T, T]][int]), list) | 3008 | 3008 | self.assertIs(get_origin(Annotated[T, 'thing']), Annotated) | 3009 | 3009 | self.assertIs(get_origin(List), list) | | 3010 | + self.assertIs(get_origin(Tuple), tuple) | | 3011 | + self.assertIs(get_origin(Callable), collections.abc.Callable) | 3010 | 3012 | self.assertIs(get_origin(list[int]), list) | 3011 | 3013 | self.assertIs(get_origin(list), None) | 3012 | 3014 |
| @@ -3024,13 +3026,16 @@ class C(Generic[T]): pass | 3024 | 3026 | (int, Tuple[str, int])) | 3025 | 3027 | self.assertEqual(get_args(typing.Dict[int, Tuple[T, T]][Optional[int]]), | 3026 | 3028 | (int, Tuple[Optional[int], Optional[int]])) | 3027 | | - self.assertEqual(get_args(Callable[[], T][int]), ([], int,)) | | 3029 | + self.assertEqual(get_args(Callable[[], T][int]), ([], int)) | | 3030 | + self.assertEqual(get_args(Callable[..., int]), (..., int)) | 3028 | 3031 | self.assertEqual(get_args(Union[int, Callable[[Tuple[T, ...]], str]]), | 3029 | 3032 | (int, Callable[[Tuple[T, ...]], str])) | 3030 | 3033 | self.assertEqual(get_args(Tuple[int, ...]), (int, ...)) | 3031 | 3034 | self.assertEqual(get_args(Tuple[()]), ((),)) | 3032 | 3035 | self.assertEqual(get_args(Annotated[T, 'one', 2, ['three']]), (T, 'one', 2, ['three'])) | 3033 | | - self.assertEqual(get_args(List), (typing.T,)) | | 3036 | + self.assertEqual(get_args(List), ()) | | 3037 | + self.assertEqual(get_args(Tuple), ()) | | 3038 | + self.assertEqual(get_args(Callable), ()) | 3034 | 3039 | self.assertEqual(get_args(list[int]), (int,)) | 3035 | 3040 | self.assertEqual(get_args(list), ()) | 3036 | 3041 |
| |
Collapse file Copy file name to clipboardExpand all lines: Lib/typing.py +3-1Lines changed: 3 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -1420,11 +1420,13 @@ def get_args(tp): | 1420 | 1420 | """ | 1421 | 1421 | if isinstance(tp, _AnnotatedAlias): | 1422 | 1422 | return (tp.__origin__,) + tp.__metadata__ | 1423 | | - if isinstance(tp, (_GenericAlias, GenericAlias)): | | 1423 | + if isinstance(tp, _GenericAlias) and not tp._special: | 1424 | 1424 | res = tp.__args__ | 1425 | 1425 | if tp.__origin__ is collections.abc.Callable and res[0] is not Ellipsis: | 1426 | 1426 | res = (list(res[:-1]), res[-1]) | 1427 | 1427 | return res | | 1428 | + if isinstance(tp, GenericAlias): | | 1429 | + return tp.__args__ | 1428 | 1430 | return () | 1429 | 1431 |
| 1430 | 1432 |
| |
Collapse file Copy file name to clipboard +2Lines changed: 2 additions & 0 deletions - Display the source diff
- Display the rich diff
| Original file line number | Diff line number | Diff line change |
|---|
| | 1 | +:func:`typing.get_args` now always returns an empty tuple for special | | 2 | +generic aliases. |
|