Simplify some code

ilevkivskyi · ilevkivskyi · commit 5b8d45367b2a · 2017-11-11T10:01:20.000+01:00
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -3510,7 +3510,6 @@ generic_subscript(PyTypeObject *tp, PyObject *key)
         }
         return NULL;
     }
-    return NULL;
 }
 
 static PyMappingMethods generic_as_mapping = {
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -50,73 +50,62 @@ static PyObject*
 update_bases(PyObject* bases, PyObject** args, int nargs, int* modified_bases)
 {
     int i, ind, tot_nones;
-    PyObject *new_bases;
+    PyObject *base, *new_base, *new_base_meth, *new_bases;
+    PyObject* stack[1] = {bases};
     assert(PyTuple_Check(bases));
 
     /* We have a separate cycle to calculate replacements with the idea that in
        most cases we just scroll quickly though it and return original bases */
     for (i = 2; i < nargs; i++){
-        PyObject *base, *new_base, *new_base_meth;
-        PyObject* stack[1];
         base  = args[i];
         if (PyType_Check(base)) {
             continue;
         }
         new_base_meth = PyObject_GetAttrString(base, "__base_subclass__");
-        if (new_base_meth == NULL) {
+        if (!new_base_meth) {
             if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
                 PyErr_Clear();
+                continue;
             }
-            else {
-                return NULL;
-            }
-        }
-        else {
-            if (!PyCallable_Check(new_base_meth)) {
-                PyErr_SetString(PyExc_TypeError,
-                                "__base_subclass__ must be callable");
-                return NULL;
-            }
-            stack[0] = bases;
-            new_base = _PyObject_FastCall(new_base_meth, stack, 1);
-            if (new_base == NULL){
-                return NULL;
-            }
-            Py_INCREF(new_base);
-            args[i] = new_base;
-            *modified_bases = 1;
+            return NULL;
         }
-    }
-
-    if (*modified_bases){
-        /* Find out have many bases wants to be removed to pre-allocate
-           the tuple for new bases */
-        tot_nones = 0;
-        for (i = 2; i < nargs; i++) {
-            if (args[i] == Py_None) {
-                tot_nones++;
-            }
+        if (!PyCallable_Check(new_base_meth)) {
+            PyErr_SetString(PyExc_TypeError,
+                            "__base_subclass__ must be callable");
+            return NULL;
         }
-        new_bases = PyTuple_New(nargs - 2 - tot_nones);
-        /* Remove all None's from base classes */
-        ind = 0;
-        for (i = 2; i < nargs; i++) {
-            PyObject* base;
-            base = args[i];
-            if (base != Py_None) {
-                Py_INCREF(base);
-                PyTuple_SET_ITEM(new_bases, ind, base);
-                ind++;
-            }
+        new_base = _PyObject_FastCall(new_base_meth, stack, 1);
+        if (!new_base){
+            return NULL;
         }
-        return new_bases;
+        Py_INCREF(new_base);
+        args[i] = new_base;
+        *modified_bases = 1;
     }
-    else {
+    if (!*modified_bases){
         return bases;
     }
+    /* Find out have many bases wants to be removed to pre-allocate
+       the tuple for new bases, then keep only non-None's in bases.*/
+    tot_nones = 0;
+    for (i = 2; i < nargs; i++) {
+        if (args[i] == Py_None) {
+            tot_nones++;
+        }
+    }
+    new_bases = PyTuple_New(nargs - 2 - tot_nones);
+    ind = 0;
+    for (i = 2; i < nargs; i++) {
+        base = args[i];
+        if (base != Py_None) {
+            Py_INCREF(base);
+            PyTuple_SET_ITEM(new_bases, ind, base);
+            ind++;
+        }
+    }
+    return new_bases;
 }
 
-
 /* AC: cannot convert yet, waiting for *args support */
 static PyObject *
 builtin___build_class__(PyObject *self, PyObject **args, Py_ssize_t nargs,

Original file line number	Diff line number	Diff line change
`@@ -3510,7 +3510,6 @@ generic_subscript(PyTypeObject tp, PyObject key)`
`3510`	`3510`	`}`
`3511`	`3511`	`return NULL;`
`3512`	`3512`	`}`
`3513`		`- return NULL;`
`3514`	`3513`	`}`
`3515`	`3514`
`3516`	`3515`	`static PyMappingMethods generic_as_mapping = {`