Skip to content

Commit ca09e71

Browse files
authored
Merge branch 'main' into fix/evalaute_forward_ref_special_forms
2 parents b0d6303 + ebe2b94 commit ca09e71

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Unreleased
22

33
Bugfixes and changed features:
4+
- Fix regression in 4.13.0 on Python 3.10.2 causing a `TypeError` when using `Concatenate`.
5+
Patch by [Daraan](https://github.com/Daraan).
46
- Fix `TypeError` when using `evaluate_forward_ref` on Python 3.10.1-2 and 3.9.8-10.
57
Patch by [Daraan](https://github.com/Daraan).
68

doc/index.rst

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ Special typing primitives
255255

256256
.. data:: NoDefault
257257

258-
See :py:class:`typing.NoDefault`. In ``typing`` since 3.13.0.
258+
See :py:data:`typing.NoDefault`. In ``typing`` since 3.13.
259259

260260
.. versionadded:: 4.12.0
261261

@@ -341,7 +341,9 @@ Special typing primitives
341341

342342
.. data:: ReadOnly
343343

344-
See :pep:`705`. Indicates that a :class:`TypedDict` item may not be modified.
344+
See :py:data:`typing.ReadOnly` and :pep:`705`. In ``typing`` since 3.13.
345+
346+
Indicates that a :class:`TypedDict` item may not be modified.
345347

346348
.. versionadded:: 4.9.0
347349

@@ -379,8 +381,9 @@ Special typing primitives
379381

380382
.. data:: TypeIs
381383

382-
See :pep:`742`. Similar to :data:`TypeGuard`, but allows more type narrowing.
383-
In ``typing`` since 3.13.
384+
See :py:data:`typing.TypeIs` and :pep:`742`. In ``typing`` since 3.13.
385+
386+
Similar to :data:`TypeGuard`, but allows more type narrowing.
384387

385388
.. versionadded:: 4.10.0
386389

@@ -843,6 +846,8 @@ Functions
843846

844847
.. function:: get_protocol_members(tp)
845848

849+
See :py:func:`typing.get_protocol_members`. In ``typing`` since 3.13.
850+
846851
Return the set of members defined in a :class:`Protocol`. This works with protocols
847852
defined using either :class:`typing.Protocol` or :class:`typing_extensions.Protocol`.
848853

@@ -878,6 +883,8 @@ Functions
878883

879884
.. function:: is_protocol(tp)
880885

886+
See :py:func:`typing.is_protocol`. In ``typing`` since 3.13.
887+
881888
Determine if a type is a :class:`Protocol`. This works with protocols
882889
defined using either :py:class:`typing.Protocol` or :class:`typing_extensions.Protocol`.
883890

src/typing_extensions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2072,7 +2072,7 @@ def _create_concatenate_alias(origin, parameters):
20722072
if parameters[-1] is ... and sys.version_info < (3, 9, 2):
20732073
# Hack: Arguments must be types, replace it with one.
20742074
parameters = (*parameters[:-1], _EllipsisDummy)
2075-
if sys.version_info >= (3, 10, 2):
2075+
if sys.version_info >= (3, 10, 3):
20762076
concatenate = _ConcatenateGenericAlias(origin, parameters,
20772077
_typevar_types=(TypeVar, ParamSpec),
20782078
_paramspec_tvars=True)

0 commit comments

Comments
 (0)