bpo-37207: Apply code review

corona10 · corona10 · commit 162128574d12 · 2020-03-16T23:53:10.000+09:00
diff --git a/Objects/setobject.c b/Objects/setobject.c
@@ -2018,8 +2018,9 @@ static PyObject*
 set_vectorcall(PyObject *type, PyObject * const*args,
                size_t nargsf, PyObject *kwnames)
 {
-    if (kwnames && PyTuple_GET_SIZE(kwnames) != 0) {
-        PyErr_Format(PyExc_TypeError, "set() takes no keyword arguments");
+    assert(PyType_Check(type));
+
+    if (!_PyArg_NoKwnames("set", kwnames)) {
         return NULL;
     }
 
@@ -2028,8 +2029,6 @@ set_vectorcall(PyObject *type, PyObject * const*args,
         return NULL;
     }
 
-    assert(PyType_Check(type));
-
     if (nargs) {
         return make_new_set((PyTypeObject *)type, args[0]);
     }

Original file line number	Diff line number	Diff line change
`@@ -2018,8 +2018,9 @@ static PyObject*`
`2018`	`2018`	`set_vectorcall(PyObject type, PyObject const*args,`
`2019`	`2019`	`size_t nargsf, PyObject *kwnames)`
`2020`	`2020`	`{`
`2021`		`- if (kwnames && PyTuple_GET_SIZE(kwnames) != 0) {`
`2022`		`- PyErr_Format(PyExc_TypeError, "set() takes no keyword arguments");`
	`2021`	`+ assert(PyType_Check(type));`
	`2022`	`+`
	`2023`	`+ if (!_PyArg_NoKwnames("set", kwnames)) {`
`2023`	`2024`	`return NULL;`
`2024`	`2025`	`}`
`2025`	`2026`
`@@ -2028,8 +2029,6 @@ set_vectorcall(PyObject type, PyObject const*args,`
`2028`	`2029`	`return NULL;`
`2029`	`2030`	`}`
`2030`	`2031`
`2031`		`- assert(PyType_Check(type));`
`2032`		`-`
`2033`	`2032`	`if (nargs) {`
`2034`	`2033`	`return make_new_set((PyTypeObject *)type, args[0]);`
`2035`	`2034`	`}`