Skip to content

Commit 03940b1

Browse files
committed
remove redundant check
1 parent d29ca67 commit 03940b1

File tree

2 files changed

+34
-36
lines changed

2 files changed

+34
-36
lines changed

Parser/asdl_c.py

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -664,28 +664,27 @@ def visitModule(self, mod):
664664
if (numfields == -1)
665665
goto cleanup;
666666
}
667+
667668
res = 0; /* if no error occurs, this stays 0 to the end */
668-
if (PyTuple_GET_SIZE(args) > 0) {
669-
if (numfields < PyTuple_GET_SIZE(args)) {
670-
PyErr_Format(PyExc_TypeError, "%.400s constructor takes at most "
671-
"%zd positional argument%s",
672-
Py_TYPE(self)->tp_name,
673-
numfields, numfields == 1 ? "" : "s");
669+
if (numfields < PyTuple_GET_SIZE(args)) {
670+
PyErr_Format(PyExc_TypeError, "%.400s constructor takes at most "
671+
"%zd positional argument%s",
672+
Py_TYPE(self)->tp_name,
673+
numfields, numfields == 1 ? "" : "s");
674+
res = -1;
675+
goto cleanup;
676+
}
677+
for (i = 0; i < PyTuple_GET_SIZE(args); i++) {
678+
/* cannot be reached when fields is NULL */
679+
PyObject *name = PySequence_GetItem(fields, i);
680+
if (!name) {
674681
res = -1;
675682
goto cleanup;
676683
}
677-
for (i = 0; i < PyTuple_GET_SIZE(args); i++) {
678-
/* cannot be reached when fields is NULL */
679-
PyObject *name = PySequence_GetItem(fields, i);
680-
if (!name) {
681-
res = -1;
682-
goto cleanup;
683-
}
684-
res = PyObject_SetAttr(self, name, PyTuple_GET_ITEM(args, i));
685-
Py_DECREF(name);
686-
if (res < 0)
687-
goto cleanup;
688-
}
684+
res = PyObject_SetAttr(self, name, PyTuple_GET_ITEM(args, i));
685+
Py_DECREF(name);
686+
if (res < 0)
687+
goto cleanup;
689688
}
690689
if (kw) {
691690
i = 0; /* needed by PyDict_Next */

Python/Python-ast.c

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -551,28 +551,27 @@ ast_type_init(PyObject *self, PyObject *args, PyObject *kw)
551551
if (numfields == -1)
552552
goto cleanup;
553553
}
554+
554555
res = 0; /* if no error occurs, this stays 0 to the end */
555-
if (PyTuple_GET_SIZE(args) > 0) {
556-
if (numfields < PyTuple_GET_SIZE(args)) {
557-
PyErr_Format(PyExc_TypeError, "%.400s constructor takes at most "
558-
"%zd positional argument%s",
559-
Py_TYPE(self)->tp_name,
560-
numfields, numfields == 1 ? "" : "s");
556+
if (numfields < PyTuple_GET_SIZE(args)) {
557+
PyErr_Format(PyExc_TypeError, "%.400s constructor takes at most "
558+
"%zd positional argument%s",
559+
Py_TYPE(self)->tp_name,
560+
numfields, numfields == 1 ? "" : "s");
561+
res = -1;
562+
goto cleanup;
563+
}
564+
for (i = 0; i < PyTuple_GET_SIZE(args); i++) {
565+
/* cannot be reached when fields is NULL */
566+
PyObject *name = PySequence_GetItem(fields, i);
567+
if (!name) {
561568
res = -1;
562569
goto cleanup;
563570
}
564-
for (i = 0; i < PyTuple_GET_SIZE(args); i++) {
565-
/* cannot be reached when fields is NULL */
566-
PyObject *name = PySequence_GetItem(fields, i);
567-
if (!name) {
568-
res = -1;
569-
goto cleanup;
570-
}
571-
res = PyObject_SetAttr(self, name, PyTuple_GET_ITEM(args, i));
572-
Py_DECREF(name);
573-
if (res < 0)
574-
goto cleanup;
575-
}
571+
res = PyObject_SetAttr(self, name, PyTuple_GET_ITEM(args, i));
572+
Py_DECREF(name);
573+
if (res < 0)
574+
goto cleanup;
576575
}
577576
if (kw) {
578577
i = 0; /* needed by PyDict_Next */

0 commit comments

Comments
 (0)