Small formatting cleanup

Author: da-woods

Objects/descrobject.c

@@ -1061,7 +1061,7 @@ static PyMappingMethods mappingproxy_as_mapping = {
     0,                                          /* mp_ass_subscript */
 };
 
-static int is_known_dict_subclass_or(PyObject *o) {
+static int mappingproxy_is_known_dict_subclass_or(PyObject *o) {
     return (PyAnyDict_CheckExact(o) || PyODict_CheckExact(o) ||
         (PyAnyDict_Check(o) && Py_TYPE(o)->tp_as_number->nb_or == PyDict_Type.tp_as_number->nb_or)) ||
         (PyODict_Check(o) && Py_TYPE(o)->tp_as_number->nb_or == PyODict_Type.tp_as_number->nb_or);
@@ -1075,13 +1075,13 @@ mappingproxy_or(PyObject *left, PyObject *right)
             right = ((mappingproxyobject*)right)->mapping; 
         }
         PyObject *left_mapping = ((mappingproxyobject*)left)->mapping;
-        if (is_known_dict_subclass_or(right) || PyFrozenDict_CheckExact(left_mapping)) {
+        if (mappingproxy_is_known_dict_subclass_or(right) || PyFrozenDict_CheckExact(left_mapping)) {
             return PyNumber_Or(left_mapping, right);
         }
     } else {
         assert(PyObject_TypeCheck(right, &PyDictProxy_Type));
         PyObject *right_mapping = ((mappingproxyobject*)right)->mapping;
-        if (is_known_dict_subclass_or(left) || PyFrozenDict_CheckExact(right_mapping)) {
+        if (mappingproxy_is_known_dict_subclass_or(left) || PyFrozenDict_CheckExact(right_mapping)) {
             return PyNumber_Or(left, right_mapping);
         }
     }
@@ -1246,6 +1246,13 @@ mappingproxy_traverse(PyObject *self, visitproc visit, void *arg)
     return 0;
 }
 
+static int
+mappingproxy_is_known_dict_subclass_richcompare(PyObject *o) {
+    return (PyAnyDict_CheckExact(o) || PyODict_CheckExact(o) ||
+        (PyAnyDict_Check(o) && Py_TYPE(o)->tp_richcompare == PyDict_Type.tp_richcompare) ||
+        (PyODict_Check(o) && Py_TYPE(o)->tp_richcompare == PyODict_Type.tp_richcompare));
+}
+
 static PyObject *
 mappingproxy_richcompare(PyObject *self, PyObject *w, int op)
 {
@@ -1254,17 +1261,7 @@ mappingproxy_richcompare(PyObject *self, PyObject *w, int op)
         if (PyObject_TypeCheck(w, &PyDictProxy_Type)) {
             w = ((mappingproxyobject *)w)->mapping;
         }
-
-        if (PyAnyDict_CheckExact(w) ||
-                (PyAnyDict_Check(w) && Py_TYPE(w)->tp_richcompare == PyDict_Type.tp_richcompare)) {
-            return PyObject_RichCompare(v->mapping, w, op);
-        }
-        if (PyODict_CheckExact(w) ||
-                (PyODict_Check(w) && Py_TYPE(w)->tp_richcompare == PyODict_Type.tp_richcompare)) {
-            return PyObject_RichCompare(v->mapping, w, op);
-        }
-        if (PyFrozenDict_CheckExact(v->mapping)) {
-            // immutable - safe to foward.
+        if (mappingproxy_is_known_dict_subclass_richcompare(w) || PyFrozenDict_CheckExact(v->mapping)) {
             return PyObject_RichCompare(v->mapping, w, op);
         }
     }