GeezerVison is showing github.com — [3.13] gh-118814: Fix the TypeVar constructor when name is passed by … · serhiy-storchaka/cpython@5d0a55d
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: Lib/test/test_clinic.py +21-5Lines changed: 21 additions & 5 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -3334,11 +3334,27 @@ def test_vararg(self): | 3334 | 3334 | self.assertEqual(ac_tester.vararg(1, 2, 3, 4), (1, (2, 3, 4))) | 3335 | 3335 |
| 3336 | 3336 | def test_vararg_with_default(self): | 3337 | | - with self.assertRaises(TypeError): | 3338 | | - ac_tester.vararg_with_default() | 3339 | | - self.assertEqual(ac_tester.vararg_with_default(1, b=False), (1, (), False)) | 3340 | | - self.assertEqual(ac_tester.vararg_with_default(1, 2, 3, 4), (1, (2, 3, 4), False)) | 3341 | | - self.assertEqual(ac_tester.vararg_with_default(1, 2, 3, 4, b=True), (1, (2, 3, 4), True)) | | 3337 | + fn = ac_tester.vararg_with_default | | 3338 | + self.assertRaises(TypeError, fn) | | 3339 | + self.assertRaises(TypeError, fn, 1, a=2) | | 3340 | + self.assertEqual(fn(1, b=2), (1, (), True)) | | 3341 | + self.assertEqual(fn(1, 2, 3, 4), (1, (2, 3, 4), False)) | | 3342 | + self.assertEqual(fn(1, 2, 3, 4, b=5), (1, (2, 3, 4), True)) | | 3343 | + self.assertEqual(fn(a=1), (1, (), False)) | | 3344 | + self.assertEqual(fn(a=1, b=2), (1, (), True)) | | 3345 | + | | 3346 | + def test_vararg_with_default2(self): | | 3347 | + fn = ac_tester.vararg_with_default2 | | 3348 | + self.assertRaises(TypeError, fn) | | 3349 | + self.assertRaises(TypeError, fn, 1, a=2) | | 3350 | + self.assertEqual(fn(1, b=2), (1, (), 2, None)) | | 3351 | + self.assertEqual(fn(1, b=2, c=3), (1, (), 2, 3)) | | 3352 | + self.assertEqual(fn(1, 2, 3), (1, (2, 3), None, None)) | | 3353 | + self.assertEqual(fn(1, 2, 3, b=4), (1, (2, 3), 4, None)) | | 3354 | + self.assertEqual(fn(1, 2, 3, b=4, c=5), (1, (2, 3), 4, 5)) | | 3355 | + self.assertEqual(fn(a=1), (1, (), None, None)) | | 3356 | + self.assertEqual(fn(a=1, b=2), (1, (), 2, None)) | | 3357 | + self.assertEqual(fn(a=1, b=2, c=3), (1, (), 2, 3)) | 3342 | 3358 |
| 3343 | 3359 | def test_vararg_with_only_defaults(self): | 3344 | 3360 | self.assertEqual(ac_tester.vararg_with_only_defaults(), ((), None)) | |
Collapse file Copy file name to clipboardExpand all lines: Lib/test/test_typing.py +49Lines changed: 49 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -578,6 +578,55 @@ def test_constructor(self): | 578 | 578 | self.assertEqual(T.__name__, "T") | 579 | 579 | self.assertEqual(T.__constraints__, ()) | 580 | 580 | self.assertIs(T.__bound__, None) | | 581 | + self.assertIs(T.__default__, typing.NoDefault) | | 582 | + self.assertIs(T.__covariant__, False) | | 583 | + self.assertIs(T.__contravariant__, False) | | 584 | + self.assertIs(T.__infer_variance__, False) | | 585 | + | | 586 | + T = TypeVar(name="T", bound=type) | | 587 | + self.assertEqual(T.__name__, "T") | | 588 | + self.assertEqual(T.__constraints__, ()) | | 589 | + self.assertIs(T.__bound__, type) | | 590 | + self.assertIs(T.__default__, typing.NoDefault) | | 591 | + self.assertIs(T.__covariant__, False) | | 592 | + self.assertIs(T.__contravariant__, False) | | 593 | + self.assertIs(T.__infer_variance__, False) | | 594 | + | | 595 | + T = TypeVar(name="T", default=()) | | 596 | + self.assertEqual(T.__name__, "T") | | 597 | + self.assertEqual(T.__constraints__, ()) | | 598 | + self.assertIs(T.__bound__, None) | | 599 | + self.assertIs(T.__default__, ()) | | 600 | + self.assertIs(T.__covariant__, False) | | 601 | + self.assertIs(T.__contravariant__, False) | | 602 | + self.assertIs(T.__infer_variance__, False) | | 603 | + | | 604 | + T = TypeVar(name="T", covariant=True) | | 605 | + self.assertEqual(T.__name__, "T") | | 606 | + self.assertEqual(T.__constraints__, ()) | | 607 | + self.assertIs(T.__bound__, None) | | 608 | + self.assertIs(T.__default__, typing.NoDefault) | | 609 | + self.assertIs(T.__covariant__, True) | | 610 | + self.assertIs(T.__contravariant__, False) | | 611 | + self.assertIs(T.__infer_variance__, False) | | 612 | + | | 613 | + T = TypeVar(name="T", contravariant=True) | | 614 | + self.assertEqual(T.__name__, "T") | | 615 | + self.assertEqual(T.__constraints__, ()) | | 616 | + self.assertIs(T.__bound__, None) | | 617 | + self.assertIs(T.__default__, typing.NoDefault) | | 618 | + self.assertIs(T.__covariant__, False) | | 619 | + self.assertIs(T.__contravariant__, True) | | 620 | + self.assertIs(T.__infer_variance__, False) | | 621 | + | | 622 | + T = TypeVar(name="T", infer_variance=True) | | 623 | + self.assertEqual(T.__name__, "T") | | 624 | + self.assertEqual(T.__constraints__, ()) | | 625 | + self.assertIs(T.__bound__, None) | | 626 | + self.assertIs(T.__default__, typing.NoDefault) | | 627 | + self.assertIs(T.__covariant__, False) | | 628 | + self.assertIs(T.__contravariant__, False) | | 629 | + self.assertIs(T.__infer_variance__, True) | 581 | 630 |
| 582 | 631 |
| 583 | 632 | class TypeParameterDefaultsTests(BaseTestCase): | |
Collapse file Copy file name to clipboard +1Lines changed: 1 addition & 0 deletions - Display the source diff
- Display the rich diff
| Original file line number | Diff line number | Diff line change |
|---|
| | 1 | +Fix the :class:`typing.TypeVar` constructor when name is passed by keyword. |
Collapse file Copy file name to clipboardExpand all lines: Modules/_testclinic.c +20Lines changed: 20 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -1033,6 +1033,25 @@ vararg_with_default_impl(PyObject *module, PyObject *a, PyObject *args, | 1033 | 1033 | } | 1034 | 1034 |
| 1035 | 1035 |
| | 1036 | +/*[clinic input] | | 1037 | +vararg_with_default2 | | 1038 | +
| | 1039 | + a: object | | 1040 | + *args: object | | 1041 | + b: object = None | | 1042 | + c: object = None | | 1043 | +
| | 1044 | +[clinic start generated code]*/ | | 1045 | + | | 1046 | +static PyObject * | | 1047 | +vararg_with_default2_impl(PyObject *module, PyObject *a, PyObject *args, | | 1048 | + PyObject *b, PyObject *c) | | 1049 | +/*[clinic end generated code: output=a0fb7c37796e2129 input=59fb22f5f0a8925f]*/ | | 1050 | +{ | | 1051 | + return pack_arguments_newref(4, a, args, b, c); | | 1052 | +} | | 1053 | + | | 1054 | + | 1036 | 1055 | /*[clinic input] | 1037 | 1056 | vararg_with_only_defaults | 1038 | 1057 |
| @@ -1907,6 +1926,7 @@ static PyMethodDef tester_methods[] = { | 1907 | 1926 | VARARG_AND_POSONLY_METHODDEF | 1908 | 1927 | VARARG_METHODDEF | 1909 | 1928 | VARARG_WITH_DEFAULT_METHODDEF | | 1929 | + VARARG_WITH_DEFAULT2_METHODDEF | 1910 | 1930 | VARARG_WITH_ONLY_DEFAULTS_METHODDEF | 1911 | 1931 | GH_32092_OOB_METHODDEF | 1912 | 1932 | GH_32092_KW_PASS_METHODDEF | |
Collapse file Copy file name to clipboardExpand all lines: Modules/clinic/_testclinic.c.h +73-1Lines changed: 73 additions & 1 deletion Collapse file Copy file name to clipboardExpand all lines: Python/getargs.c +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -2574,7 +2574,7 @@ _PyArg_UnpackKeywordsWithVararg(PyObject *const *args, Py_ssize_t nargs, | 2574 | 2574 | * | 2575 | 2575 | * Otherwise, we leave a place at `buf[vararg]` for vararg tuple | 2576 | 2576 | * so the index is `i + 1`. */ | 2577 | | - if (nargs < vararg && i != vararg) { | | 2577 | + if (i < vararg) { | 2578 | 2578 | buf[i] = current_arg; | 2579 | 2579 | } | 2580 | 2580 | else { | |
|