[Python-checkins] bpo-46581: Propagate private vars via _GenericAlias.copy_with (GH-31061)
serhiy-storchaka
webhook-mailer at python.org
Thu Mar 10 09:42:43 EST 2022
https://github.com/python/cpython/commit/32bf3597922ac3f613989582afa2bff43bea8a2f
commit: 32bf3597922ac3f613989582afa2bff43bea8a2f
branch: main
author: Matt Bogosian <matt at bogosian.net>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-03-10T16:42:15+02:00
summary:
bpo-46581: Propagate private vars via _GenericAlias.copy_with (GH-31061)
GH-26091 added the _typevar_types and _paramspec_tvars instance
variables to _GenericAlias. However, they were not propagated
consistently. This commit addresses the most prominent deficiency
identified in bpo-46581 (namely their absence from
_GenericAlias.copy_with), but there could be others.
Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>
Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>
files:
A Misc/NEWS.d/next/Library/2022-02-01-11-32-47.bpo-46581.t7Zw65.rst
M Lib/test/test_typing.py
M Lib/typing.py
M Misc/ACKS
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 5c1e907070ee4..fc596e4d90b21 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -5793,6 +5793,27 @@ def test_paramspec_in_nested_generics(self):
self.assertEqual(G2[[int, str], float], list[C])
self.assertEqual(G3[[int, str], float], list[C] | int)
+ def test_paramspec_gets_copied(self):
+ # bpo-46581
+ P = ParamSpec('P')
+ P2 = ParamSpec('P2')
+ C1 = Callable[P, int]
+ self.assertEqual(C1.__parameters__, (P,))
+ self.assertEqual(C1[P2].__parameters__, (P2,))
+ self.assertEqual(C1[str].__parameters__, ())
+ self.assertEqual(C1[str, T].__parameters__, (T,))
+ self.assertEqual(C1[Concatenate[str, P2]].__parameters__, (P2,))
+ self.assertEqual(C1[Concatenate[T, P2]].__parameters__, (T, P2))
+ self.assertEqual(C1[...].__parameters__, ())
+
+ C2 = Callable[Concatenate[str, P], int]
+ self.assertEqual(C2.__parameters__, (P,))
+ self.assertEqual(C2[P2].__parameters__, (P2,))
+ self.assertEqual(C2[str].__parameters__, ())
+ self.assertEqual(C2[str, T].__parameters__, (T,))
+ self.assertEqual(C2[Concatenate[str, P2]].__parameters__, (P2,))
+ self.assertEqual(C2[Concatenate[T, P2]].__parameters__, (T, P2))
+
class ConcatenateTests(BaseTestCase):
def test_basics(self):
diff --git a/Lib/typing.py b/Lib/typing.py
index abb8bcefc5c04..e3015563b3e8c 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -670,7 +670,9 @@ def Concatenate(self, parameters):
"ParamSpec variable.")
msg = "Concatenate[arg, ...]: each arg must be a type."
parameters = (*(_type_check(p, msg) for p in parameters[:-1]), parameters[-1])
- return _ConcatenateGenericAlias(self, parameters)
+ return _ConcatenateGenericAlias(self, parameters,
+ _typevar_types=(TypeVar, ParamSpec),
+ _paramspec_tvars=True)
@_SpecialForm
@@ -1339,7 +1341,9 @@ def _determine_new_args(self, args):
return tuple(new_args)
def copy_with(self, args):
- return self.__class__(self.__origin__, args, name=self._name, inst=self._inst)
+ return self.__class__(self.__origin__, args, name=self._name, inst=self._inst,
+ _typevar_types=self._typevar_types,
+ _paramspec_tvars=self._paramspec_tvars)
def __repr__(self):
if self._name:
@@ -1548,11 +1552,6 @@ def __hash__(self):
class _ConcatenateGenericAlias(_GenericAlias, _root=True):
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs,
- _typevar_types=(TypeVar, ParamSpec),
- _paramspec_tvars=True)
-
def copy_with(self, params):
if isinstance(params[-1], (list, tuple)):
return (*params[:-1], *params[-1])
diff --git a/Misc/ACKS b/Misc/ACKS
index df851bb834cd4..84fcb322d4086 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -190,6 +190,7 @@ Paul Boddie
Matthew Boedicker
Robin Boerdijk
Andra Bogildea
+Matt Bogosian
Nikolay Bogoychev
David Bolen
Wouter Bolsterlee
diff --git a/Misc/NEWS.d/next/Library/2022-02-01-11-32-47.bpo-46581.t7Zw65.rst b/Misc/NEWS.d/next/Library/2022-02-01-11-32-47.bpo-46581.t7Zw65.rst
new file mode 100644
index 0000000000000..1982c1d70093f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-02-01-11-32-47.bpo-46581.t7Zw65.rst
@@ -0,0 +1,2 @@
+Brings :class:`ParamSpec` propagation for :class:`GenericAlias` in line with
+:class:`Concatenate` (and others).
More information about the Python-checkins
mailing list