Skip to content

_collect_type_vars should not collect Unpack objects itself #472

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

Merged
merged 10 commits into from
Sep 26, 2024
Merged

_collect_type_vars should not collect Unpack objects itself #472

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e574392
Fix Unpack recognized as TypeVar
Daraan Sep 26, 2024
2e23eb8
added tests
Daraan Sep 26, 2024
0b46a96
more clear comment
Daraan Sep 26, 2024
94ac77d
Added tests with public function and more specific test of root cause
Daraan Sep 26, 2024
f364651
Merge branch 'main' into _collect_type_vars_unpack
AlexWaygood Sep 26, 2024
e8e6ee9
removed test for private function; fix naming of other function
Daraan Sep 26, 2024
efed6d4
Merge branch 'main' into _collect_type_vars_unpack
AlexWaygood Sep 26, 2024
2a166e8
Updated changelog
Daraan Sep 26, 2024
5a0612b
make tests more realistic
AlexWaygood Sep 26, 2024
7f69938
touchup changelog
AlexWaygood Sep 26, 2024
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
27 changes: 27 additions & 0 deletions src/test_typing_extensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5779,6 +5779,33 @@ class D(Protocol[T1, T2, Unpack[Ts]]): pass
with self.assertRaises(TypeError):
klass[int]

def test_with_non_typevartuple(self):
# The two functions below are used by typing._GenericAlias and typing.Generic via monkey patching.
T = TypeVar('T')
class MyTypedDict(TypedDict):
foo: int
bar: str
class MyTypedDictT(Generic[T], TypedDict):
foo: T
bar: str

with self.subTest("_collect_type_vars"):
if not hasattr(typing_extensions, "_collect_type_vars"):
self.skipTest("No _collect_type_vars")
self.assertEqual(typing_extensions._collect_type_vars((Unpack[MyTypedDict], )), ())
self.assertEqual(typing_extensions._collect_type_vars((Unpack[MyTypedDictT], )), ())
self.assertEqual(typing_extensions._collect_type_vars((Unpack[MyTypedDictT[T]], )), (T,))
self.assertEqual(typing_extensions._collect_type_vars((Unpack[Tuple[int]], )), ())
self.assertEqual(typing_extensions._collect_type_vars((Unpack[Tuple[int, T]], )), (T,))
with self.subTest("_collect_parameters"):
if not hasattr(typing_extensions, "_collect_parameters"):
self.skipTest("No _collect_parameters")
self.assertEqual(typing_extensions._collect_parameters((Unpack[MyTypedDict], )), ())
self.assertEqual(typing_extensions._collect_parameters((Unpack[MyTypedDictT], )), ())
self.assertEqual(typing_extensions._collect_parameters((Unpack[MyTypedDictT[T]], )), (T,))
self.assertEqual(typing_extensions._collect_parameters((Unpack[Tuple[int]], )), ())
self.assertEqual(typing_extensions._collect_parameters((Unpack[Tuple[int, T]], )), (T,))


class TypeVarTupleTests(BaseTestCase):

Expand Down
5 changes: 4 additions & 1 deletion src/typing_extensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3068,7 +3068,10 @@ def _collect_type_vars(types, typevar_types=None):
for t in types:
if _is_unpacked_typevartuple(t):
type_var_tuple_encountered = True
elif isinstance(t, typevar_types) and t not in tvars:
elif (
isinstance(t, typevar_types) and not isinstance(t, _UnpackAlias)
and t not in tvars
):
if enforce_default_ordering:
has_default = getattr(t, '__default__', NoDefault) is not NoDefault
if has_default:
Expand Down
Loading