Support ParamSpec for TypeAliasType by Daraan · Pull Request #449 · python/typing_extensions

Daraan · 2024-08-21T23:40:05Z

Fixes#448 that usage of ParamSpec with TypeAliasType was limited for < Python 3.11

This PR enables TypeAliasType to use Ellipsis and list arguments for ParamSpec type params.

Daraan · 2024-09-23T14:28:32Z

+ self.assertEqual(get_args(callable_concat), (Concatenate[int, P],))
+ concat_usage = callable_concat[str]
+ self.assertEqual(get_args(concat_usage), ((int, str),))
+ self.assertEqual(concat_usage, callable_concat[[str]])


Should this block be removed? This is more about GenericAlias usage here and how Concatenate/Unpack is handled.
I think the self.assertEqual(concat_usage, callable_concat[[str]]) test is interesting, but I am not sure about the specifications if this should be valid and stay here.
See also the test_invalid_cases tests where this is redone with a TypeVar.

Since using types.GenericAlias these tests became much clearer. Given that Concatenate might need some special treatmeant in TypeAliasType.__getitem__ (currently done by isinstance(param, list)) and this is the only test where this is looked into with a bit more detail, I think it should probaly stay.

AlexWaygood

I haven't looked deeply at the changes in this PR yet (will do so either today or tomorrow), but here's some comments from skimming through:

+ formatting

…sion

Related to: python/cpython#124787

minor comment corrections

JelleZijlstra · 2024-10-21T12:40:54Z

 return self.__name__

+ if sys.version_info < (3, 11):
+ def _check_single_param(self, param, recursion=0):


Doesn't seem like this needs to be a generator, it always yields a single value. Let's make it return that value instead and simplify _check_parameters.

Looking at it again. As the current cpython implementation does not not seems to use _type_convert or any restrictions, should we just drop all checks here?

Changes in #489 are necessary to remove _check_parameters / _type_convert. More specifically, _ConcatenateGenericAlias needs _copy_with and __getitem__ if it is not converted to a list via the above functions to be handled correctly in 3.8 & 3.9.

…sion

Daraan · 2024-10-25T14:56:21Z

+ with self.subTest("get_args of Concatenate in TypeAliasType"):
+ if not TYPING_3_9_0:
+ # args are: ([<class 'int'>, ~P2],)
+ self.skipTest("Nested ParamSpec is not substituted")


Need to check if #489 or #491 allow to execute this test.

…sion

Daraan added 3 commits August 22, 2024 01:33

Support ParamSpec for TypeAliasType
b6bc323

Removed trailing whitespaces
79985f3

Merge branch 'main' into TypeAliasType-extension
02025d4

This comment was marked as off-topic.
Sign in to view

JelleZijlstra reviewed Sep 18, 2024
View reviewed changes

Comment threadsrc/typing_extensions.py Outdated
Comment threadsrc/typing_extensions.py Outdated

Daraan added 5 commits September 18, 2024 17:26

raise TypeError for invalid type_params like typing.TypeAliasType
3199b7b

Keep dunder attributes like typing.TypeAliasType
f7d79d9

Added test to catch invalid cases, fix wrong intendation
c4c0e68

removed pyright pragma
d6af983

fix whitespaces
0a5039b

Daraan commented Sep 18, 2024
View reviewed changes

Comment threadsrc/typing_extensions.py Outdated

Daraan added 4 commits September 19, 2024 14:35

Avoid incompatible global types
e532429

Add __name__ for TypeAliasType for <=3.10
9911ac7

Added missing support for Unpack to TypeAliasType variant
e1b3095

Added more invalid test cases
408ae2e

Daraan commented Sep 19, 2024
View reviewed changes

Comment threadsrc/test_typing_extensions.py

Daraan added 2 commits September 19, 2024 16:53

Merge branch 'main' into TypeAliasType-extension
621085f

Unpack invalid Concatenate correctly
b3e6b7a

Daraan commented Sep 19, 2024
View reviewed changes

Comment threadsrc/typing_extensions.py Outdated

Daraan added 6 commits September 23, 2024 14:53

Removed parameter checking from TypeAliasType._check_parameter
c3d98c6

extended and reworked tests
8255667

Clean duplicated tests
255de76

Removed duplicated or valid cases from invalid
3037923

Slightly more refined tests covering more cases
b8ae82e

Removed cases that is mentioned elsewhere
8d2ec0a

Daraan commented Sep 23, 2024
View reviewed changes

AlexWaygood reviewed Sep 24, 2024
View reviewed changes

Comment threadsrc/test_typing_extensions.py Outdated
Comment threadsrc/test_typing_extensions.py Outdated
Comment threadsrc/test_typing_extensions.py Outdated
Comment threadsrc/typing_extensions.py Outdated
Comment threadsrc/typing_extensions.py Outdated

Daraan added 3 commits September 24, 2024 10:49

Revert change of global Protocol variables
7029d51

Raise TypeError on parameterless alias
02fd0ba
+ formatting

Merge remote-tracking branch 'upstream/main' into TypeAliasType-exten…
5c0938c
…sion

JelleZijlstra reviewed Sep 26, 2024
View reviewed changes

Comment threadsrc/test_typing_extensions.py Outdated

JelleZijlstra reviewed Sep 26, 2024
View reviewed changes

Comment threadsrc/test_typing_extensions.py Outdated
Comment threadsrc/test_typing_extensions.py Outdated

Daraan added 11 commits September 30, 2024 15:58

removed tests related to:python/cpython#124445
6bc1f57

Removed tests related topython#474
e8bfa30

Removed invalid tests
617656d
Related to: python/cpython#124787

minor comment update
41a87b8

Merge branch 'main' into TypeAliasType-extension
a8c4bda

More refined skip reason
249b869

Remove type check for tuples; handled bypython#477
e71902e

updated changelog
b8799ce

3.8, 3.9 use collected parameters more explicitly
5bc1360
minor comment corrections

Correct error message for 3.10
3ae9e35

Merge branch 'main' into TypeAliasType-extension
9878cc0

JelleZijlstra reviewed Oct 21, 2024
View reviewed changes

Daraan added 7 commits October 21, 2024 20:07

Merge remote-tracking branch 'upstream/main' into TypeAliasType-exten…
3863c8b
…sion

Merge remote-tracking branch 'upstream/main' into TypeAliasType-exten…
8c86619
…sion

Merge remote-tracking branch 'upstream/main' into TypeAliasType-exten…
251d312
…sion

Generator not necessary anymore
b3aa598

Merge remote-tracking branch 'upstream/main' into TypeAliasType-exten…
07ba7b7
…sion

Merge remote-tracking branch 'upstream/main' into TypeAliasType-exten…
28d1e84
…sion

Merge and type correction
a365355

Daraan commented Oct 25, 2024
View reviewed changes

Daraan added 5 commits October 25, 2024 18:00

TODO: handle None
fb55b88

Merge remote-tracking branch 'upstream/main' into TypeAliasType-exten…
f2d6890
…sion

Merge remote-tracking branch 'upstream/main' into TypeAliasType-exten…
054f083
…sion

Handle None case correctly, also check list
eb840ef

Merge branch 'main' into TypeAliasType-extension
02efbdc

JelleZijlstra approved these changes Nov 26, 2024
View reviewed changes

JelleZijlstra merged commit f2d0667 into python:mainNov 26, 2024

Daraan deleted the TypeAliasType-extension branch November 27, 2024 10:39

Uh oh!

Uh oh!

Conversation

Daraan commented Aug 21, 2024

Uh oh!

This comment was marked as off-topic.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DaraanSep 23, 2024

Choose a reason for hiding this comment

Uh oh!

DaraanOct 2, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

AlexWaygood left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JelleZijlstraOct 21, 2024

Choose a reason for hiding this comment

Uh oh!

DaraanOct 25, 2024

Choose a reason for hiding this comment

Uh oh!

DaraanOct 28, 2024

Choose a reason for hiding this comment

Uh oh!

DaraanOct 25, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants