Skip to content

Allow type parameters without default values to follow those with default values in some situations #392

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
JelleZijlstra merged 7 commits into from
May 16, 2024
Merged

Allow type parameters without default values to follow those with default values in some situations #392

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
54644c4
Allow type parameters without default values to follow those with def…
AlexWaygood May 14, 2024
6f91012
skip on py313 b1
AlexWaygood May 14, 2024
b3fc7ee
Merge remote-tracking branch 'upstream/main' into default-before-nond…
JelleZijlstra May 15, 2024
c05fdf6
fixup
JelleZijlstra May 15, 2024
aafe92e
here too
JelleZijlstra May 15, 2024
6ba7871
more merge fixup
AlexWaygood May 15, 2024
3f66c82
oops
AlexWaygood May 15, 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
Prev Previous commit
Next Next commit
fixup
  • Loading branch information
@JelleZijlstra
JelleZijlstra committed May 15, 2024
commit c05fdf6786e7fed3627078c97750eb3353353728
6 changes: 4 additions & 2 deletions src/typing_extensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2896,10 +2896,10 @@ def _collect_type_vars(types, typevar_types=None):
tvars = []

# required TypeVarLike cannot appear after TypeVarLike with default
# if it was a direct call to `Generic[]` or `Protocol[]`
default_encountered = False
# or after TypeVarTuple
type_var_tuple_encountered = False
# if it was a direct call to `Generic[]` or `Protocol[]`
enforce_default_ordering = _has_generic_or_protocol_as_origin()
for t in types:
if _is_unpacked_typevartuple(t):
Expand Down Expand Up @@ -2954,7 +2954,9 @@ def _collect_parameters(args):
elif hasattr(t, '__typing_subst__'):
if t not in parameters:
if enforce_default_ordering:
has_default = getattr(t, '__default__', NoDefault) is not NoDefault
has_default = (
getattr(t, '__default__', NoDefault) is not NoDefault
)

if type_var_tuple_encountered and has_default:
raise TypeError('Type parameter with a default'
Expand Down