May 3, 2024 · Feb 29, 2024 · Feb 29, 2024 · Feb 29, 2024 · Feb 29, 2024 · Mar 1, 2024
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
        self.assertIs(T.__bound__, None)


 class TypeVarLikeDefaultsTests(BaseTestCase):
    def test_typevar(self):
        T = TypeVar('T', default=int)
        self.assertEqual(T.__default__, int)
        self.assertIsInstance(T, TypeVar)

        class A(Generic[T]): ...
        Alias = Optional[T]

    def test_typevar_none(self):
        U = TypeVar('U')
        U_None = TypeVar('U_None', default=None)
        self.assertEqual(U.__default__, None)
        self.assertEqual(U_None.__default__, type(None))

    def test_paramspec(self):
        P = ParamSpec('P', default=(str, int))
        self.assertEqual(P.__default__, (str, int))
        self.assertIsInstance(P, ParamSpec)

        class A(Generic[P]): ...
        Alias = typing.Callable[P, None]

        P_default = ParamSpec('P_default', default=...)
        self.assertIs(P_default.__default__, ...)

    def test_paramspec_none(self):
        U = ParamSpec('U')
        U_None = ParamSpec('U_None', default=None)
        self.assertEqual(U.__default__, None)
        self.assertEqual(U_None.__default__, type(None))

    def test_typevartuple(self):
        Ts = TypeVarTuple('Ts', default=Unpack[Tuple[str, int]])
        self.assertEqual(Ts.__default__, Unpack[Tuple[str, int]])
        self.assertIsInstance(Ts, TypeVarTuple)

        class A(Generic[Unpack[Ts]]): ...
        Alias = Optional[Unpack[Ts]]

    def test_typevartuple_none(self):
        U = TypeVarTuple('U')
        U_None = TypeVarTuple('U_None', default=None)
        self.assertEqual(U.__default__, None)
        self.assertEqual(U_None.__default__, type(None))

    def test_pickle(self):
        global U, U_co, U_contra, U_default  # pickle wants to reference the class by name
        U = TypeVar('U')
        U_co = TypeVar('U_co', covariant=True)
        U_contra = TypeVar('U_contra', contravariant=True)
        U_default = TypeVar('U_default', default=int)
        for proto in range(pickle.HIGHEST_PROTOCOL):
            for typevar in (U, U_co, U_contra, U_default):
                z = pickle.loads(pickle.dumps(typevar, proto))
                self.assertEqual(z.__name__, typevar.__name__)
                self.assertEqual(z.__covariant__, typevar.__covariant__)
                self.assertEqual(z.__contravariant__, typevar.__contravariant__)
                self.assertEqual(z.__bound__, typevar.__bound__)
                self.assertEqual(z.__default__, typevar.__default__)



 def template_replace(templates: list[str], replacements: dict[str, list[str]]) -> list[tuple[str]]:
    """Renders templates with possible combinations of replacements.

diff --git a/Objects/clinic/typevarobject.c.h b/Objects/clinic/typevarobject.c.h
diff --git a/Objects/typevarobject.c b/Objects/typevarobject.c
    name: object(subclass_of="&PyUnicode_Type")
    *constraints: object
    bound: object = None
    default as default_: object =None
    default as default_: object =NULL
    covariant: bool = False
    contravariant: bool = False
    infer_variance: bool = False
 typevar_new_impl(PyTypeObject *type, PyObject *name, PyObject *constraints,
                 PyObject *bound, PyObject *default_, int covariant,
                 int contravariant, int infer_variance)
 /*[clinic end generated code: output=74ee963663330604 input=7c2c5d1317165573]*/
 /*[clinic end generated code: output=74ee963663330604 input=2962ee79d92972fc]*/
 {
    if (covariant && contravariant) {
        PyErr_SetString(PyExc_ValueError,
    }
    PyObject *default_ = PyObject_CallNoArgs(self->evaluate_default);
    if (Py_IsNone(default_)) {
        default_ =Py_XNewRef(Py_TYPE(default_));
        default_ =(PyObject *)Py_TYPE(default_);
    }
    self->default_ = Py_XNewRef(default_);
    return default_;
    ps->covariant = covariant;
    ps->contravariant = contravariant;
    ps->infer_variance = infer_variance;
    ps->default_ = default_;
    ps->default_ =Py_XNewRef(default_);
    ps->evaluate_default = NULL;
    _PyObject_GC_TRACK(ps);
    if (module != NULL) {
    name: object(subclass_of="&PyUnicode_Type")
    *
    bound: object = None
    default as default_: object =None
    default as default_: object =NULL
    covariant: bool = False
    contravariant: bool = False
    infer_variance: bool = False
 paramspec_new_impl(PyTypeObject *type, PyObject *name, PyObject *bound,
                   PyObject *default_, int covariant, int contravariant,
                   int infer_variance)
 /*[clinic end generated code: output=b6be5856624d7b5d input=d95d455b87d263d6]*/
 /*[clinic end generated code: output=b6be5856624d7b5d input=5f16268ae6237a50]*/
 {
    if (covariant && contravariant) {
        PyErr_SetString(PyExc_ValueError, "Bivariant types are not supported.");

    name: object(subclass_of="&PyUnicode_Type")
    *
    default as default_: object =None
    default as default_: object =NULL

 Create a new TypeVarTuple with the given name.
 [clinic start generated code]*/

 static PyObject *
 typevartuple_impl(PyTypeObject *type, PyObject *name, PyObject *default_)
 /*[clinic end generated code: output=eb847fe0acd69560 input=701651f2d692f6ae]*/
 /*[clinic end generated code: output=eb847fe0acd69560 input=b2f0ecf512371a75]*/
 {
    PyObject *module = caller();
    if (module == NULL) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -580,6 +580,69 @@ def test_constructor(self):
		self.assertIs(T.__bound__, None)


		class TypeVarLikeDefaultsTests(BaseTestCase):
		def test_typevar(self):
		T = TypeVar('T', default=int)
		self.assertEqual(T.__default__, int)
		self.assertIsInstance(T, TypeVar)

		class A(Generic[T]): ...
		Alias = Optional[T]

		def test_typevar_none(self):
		U = TypeVar('U')
		U_None = TypeVar('U_None', default=None)
		self.assertEqual(U.__default__, None)
		self.assertEqual(U_None.__default__, type(None))

		def test_paramspec(self):
		P = ParamSpec('P', default=(str, int))
		self.assertEqual(P.__default__, (str, int))
		self.assertIsInstance(P, ParamSpec)

		class A(Generic[P]): ...
		Alias = typing.Callable[P, None]

		P_default = ParamSpec('P_default', default=...)
		self.assertIs(P_default.__default__, ...)

		def test_paramspec_none(self):
		U = ParamSpec('U')
		U_None = ParamSpec('U_None', default=None)
		self.assertEqual(U.__default__, None)
		self.assertEqual(U_None.__default__, type(None))

		def test_typevartuple(self):
		Ts = TypeVarTuple('Ts', default=Unpack[Tuple[str, int]])
		self.assertEqual(Ts.__default__, Unpack[Tuple[str, int]])
		self.assertIsInstance(Ts, TypeVarTuple)

		class A(Generic[Unpack[Ts]]): ...
		Alias = Optional[Unpack[Ts]]

		def test_typevartuple_none(self):
		U = TypeVarTuple('U')
		U_None = TypeVarTuple('U_None', default=None)
		self.assertEqual(U.__default__, None)
		self.assertEqual(U_None.__default__, type(None))

		def test_pickle(self):
		global U, U_co, U_contra, U_default # pickle wants to reference the class by name
		U = TypeVar('U')
		U_co = TypeVar('U_co', covariant=True)
		U_contra = TypeVar('U_contra', contravariant=True)
		U_default = TypeVar('U_default', default=int)
		for proto in range(pickle.HIGHEST_PROTOCOL):
		for typevar in (U, U_co, U_contra, U_default):
		z = pickle.loads(pickle.dumps(typevar, proto))
		self.assertEqual(z.__name__, typevar.__name__)
		self.assertEqual(z.__covariant__, typevar.__covariant__)
		self.assertEqual(z.__contravariant__, typevar.__contravariant__)
		self.assertEqual(z.__bound__, typevar.__bound__)
		self.assertEqual(z.__default__, typevar.__default__)



AlexWaygood marked this conversation as resolved. OutdatedShow resolvedHide resolved
		def template_replace(templates: list[str], replacements: dict[str, list[str]]) -> list[tuple[str]]:
		"""Renders templates with possible combinations of replacements.

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -361,7 +361,7 @@ typevar.__new__ as typevar_new
		name: object(subclass_of="&PyUnicode_Type")
		*constraints: object
		bound: object = None
		default as default_: object =None
		default as default_: object =NULL
		covariant: bool = False
		contravariant: bool = False
		infer_variance: bool = False
Expand All		@@ -373,7 +373,7 @@ static PyObject *
		typevar_new_impl(PyTypeObject type, PyObject name, PyObject *constraints,
		PyObject bound, PyObject default_, int covariant,
		int contravariant, int infer_variance)
		/[clinic end generated code: output=74ee963663330604 input=7c2c5d1317165573]/
		/[clinic end generated code: output=74ee963663330604 input=2962ee79d92972fc]/
		{
		if (covariant && contravariant) {
		PyErr_SetString(PyExc_ValueError,
Expand DownExpand Up		@@ -855,7 +855,7 @@ paramspec_default(paramspecobject self, void unused)
		}
		PyObject *default_ = PyObject_CallNoArgs(self->evaluate_default);
		if (Py_IsNone(default_)) {
		default_ =Py_XNewRef(Py_TYPE(default_));
		default_ =(PyObject *)Py_TYPE(default_);
		}
		self->default_ = Py_XNewRef(default_);
		return default_;
Expand All		@@ -882,7 +882,7 @@ paramspec_alloc(PyObject name, PyObject bound, PyObject *default_, bool covari
		ps->covariant = covariant;
		ps->contravariant = contravariant;
		ps->infer_variance = infer_variance;
		ps->default_ = default_;
		ps->default_ =Py_XNewRef(default_);
		ps->evaluate_default = NULL;
		_PyObject_GC_TRACK(ps);
		if (module != NULL) {
Expand All		@@ -901,7 +901,7 @@ paramspec.__new__ as paramspec_new
		name: object(subclass_of="&PyUnicode_Type")
		*
		bound: object = None
		default as default_: object =None
		default as default_: object =NULL
		covariant: bool = False
		contravariant: bool = False
		infer_variance: bool = False
Expand All		@@ -913,7 +913,7 @@ static PyObject *
		paramspec_new_impl(PyTypeObject type, PyObject name, PyObject *bound,
		PyObject *default_, int covariant, int contravariant,
		int infer_variance)
		/[clinic end generated code: output=b6be5856624d7b5d input=d95d455b87d263d6]/
		/[clinic end generated code: output=b6be5856624d7b5d input=5f16268ae6237a50]/
		{
		if (covariant && contravariant) {
		PyErr_SetString(PyExc_ValueError, "Bivariant types are not supported.");
Expand DownExpand Up		@@ -1157,14 +1157,14 @@ typevartuple.__new__

		name: object(subclass_of="&PyUnicode_Type")
		*
		default as default_: object =None
		default as default_: object =NULL

		Create a new TypeVarTuple with the given name.
		[clinic start generated code]*/

		static PyObject *
		typevartuple_impl(PyTypeObject type, PyObject name, PyObject *default_)
		/[clinic end generated code: output=eb847fe0acd69560 input=701651f2d692f6ae]/
		/[clinic end generated code: output=eb847fe0acd69560 input=b2f0ecf512371a75]/
		{
		PyObject *module = caller();
		if (module == NULL) {
Expand Down