Update ga_new to use _PyArg_CheckPositional and _PyArg_NoKwnames (GH-19679)

corona10 · web-flow · commit 02e4484f1930 · 2020-04-24T01:25:53.000+09:00
diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c
@@ -438,12 +438,10 @@ static PyGetSetDef ga_properties[] = {
 static PyObject *
 ga_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-    if (kwds != NULL && PyDict_GET_SIZE(kwds) != 0) {
-        PyErr_SetString(PyExc_TypeError, "GenericAlias does not support keyword arguments");
+    if (!_PyArg_NoKwnames("GenericAlias", kwds)) {
         return NULL;
     }
-    if (PyTuple_GET_SIZE(args) != 2) {
-        PyErr_SetString(PyExc_TypeError, "GenericAlias expects 2 positional arguments");
+    if (!_PyArg_CheckPositional("GenericAlias", PyTuple_GET_SIZE(args), 2, 2)) {
         return NULL;
     }
     PyObject *origin = PyTuple_GET_ITEM(args, 0);

Original file line number	Diff line number	Diff line change
`@@ -438,12 +438,10 @@ static PyGetSetDef ga_properties[] = {`
`438`	`438`	`static PyObject *`
`439`	`439`	`ga_new(PyTypeObject type, PyObject args, PyObject *kwds)`
`440`	`440`	`{`
`441`		`- if (kwds != NULL && PyDict_GET_SIZE(kwds) != 0) {`
`442`		`- PyErr_SetString(PyExc_TypeError, "GenericAlias does not support keyword arguments");`
	`441`	`+ if (!_PyArg_NoKwnames("GenericAlias", kwds)) {`
`443`	`442`	`return NULL;`
`444`	`443`	`}`
`445`		`- if (PyTuple_GET_SIZE(args) != 2) {`
`446`		`- PyErr_SetString(PyExc_TypeError, "GenericAlias expects 2 positional arguments");`
	`444`	`+ if (!_PyArg_CheckPositional("GenericAlias", PyTuple_GET_SIZE(args), 2, 2)) {`
`447`	`445`	`return NULL;`
`448`	`446`	`}`
`449`	`447`	`PyObject *origin = PyTuple_GET_ITEM(args, 0);`