Replace AddObject() with AddObjectRef()

src_c/_camera.c

@@ -1988,15 +1988,12 @@ MODINIT_DEFINE(_camera)
         return NULL;
     }
 
-    Py_INCREF(&pgCamera_Type);
-    if (PyModule_AddObject(module, "CameraType", (PyObject *)&pgCamera_Type)) {
-        Py_DECREF(&pgCamera_Type);
+    if (PyModule_AddObjectRef(module, "CameraType",
+                              (PyObject *)&pgCamera_Type)) {
         Py_DECREF(module);
         return NULL;
     }
-    Py_INCREF(&pgCamera_Type);
-    if (PyModule_AddObject(module, "Camera", (PyObject *)&pgCamera_Type)) {
-        Py_DECREF(&pgCamera_Type);
+    if (PyModule_AddObjectRef(module, "Camera", (PyObject *)&pgCamera_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/_freetype.c

@@ -2383,9 +2383,8 @@ MODINIT_DEFINE(_freetype)
     FREETYPE_MOD_STATE(module)->cache_size = 0;
     FREETYPE_MOD_STATE(module)->resolution = PGFT_DEFAULT_RESOLUTION;
 
-    Py_INCREF(&pgFont_Type);
-    if (PyModule_AddObject(module, FONT_TYPE_NAME, (PyObject *)&pgFont_Type)) {
-        Py_DECREF(&pgFont_Type);
+    if (PyModule_AddObjectRef(module, FONT_TYPE_NAME,
+                              (PyObject *)&pgFont_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/base.c

@@ -2404,9 +2404,7 @@ MODINIT_DEFINE(base)
     pgExc_BufferError =
         PyErr_NewException("pygame.BufferError", PyExc_BufferError, NULL);
     /* Because we need a reference to BufferError in the base module */
-    Py_XINCREF(pgExc_BufferError);
-    if (PyModule_AddObject(module, "BufferError", pgExc_BufferError)) {
-        Py_XDECREF(pgExc_BufferError);
+    if (PyModule_AddObjectRef(module, "BufferError", pgExc_BufferError)) {
         goto error;
     }
 

src_c/bufferproxy.c

@@ -604,10 +604,8 @@ MODINIT_DEFINE(bufferproxy)
         return NULL;
     }
 
-    Py_INCREF(&pgBufferProxy_Type);
-    if (PyModule_AddObject(module, "BufferProxy",
-                           (PyObject *)&pgBufferProxy_Type)) {
-        Py_DECREF(&pgBufferProxy_Type);
+    if (PyModule_AddObjectRef(module, "BufferProxy",
+                              (PyObject *)&pgBufferProxy_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/color.c

@@ -2485,15 +2485,10 @@ MODINIT_DEFINE(color)
         goto error;
     }
 
-    Py_INCREF(&pgColor_Type);
-    if (PyModule_AddObject(module, "Color", (PyObject *)&pgColor_Type)) {
-        Py_DECREF(&pgColor_Type);
+    if (PyModule_AddObjectRef(module, "Color", (PyObject *)&pgColor_Type)) {
         goto error;
     }
-    Py_INCREF(_COLORDICT);
-    if (PyModule_AddObject(module, "THECOLORS", _COLORDICT)) {
-        /* Yes, _COLORDICT is decref'd twice here and we want that */
-        Py_DECREF(_COLORDICT);
+    if (PyModule_AddObjectRef(module, "THECOLORS", _COLORDICT)) {
         goto error;
     }
 

src_c/event.c

@@ -2578,15 +2578,12 @@ MODINIT_DEFINE(event)
         return NULL;
     }
 
-    Py_INCREF(&pgEvent_Type);
-    if (PyModule_AddObject(module, "EventType", (PyObject *)&pgEvent_Type)) {
-        Py_DECREF(&pgEvent_Type);
+    if (PyModule_AddObjectRef(module, "EventType",
+                              (PyObject *)&pgEvent_Type)) {
         Py_DECREF(module);
         return NULL;
     }
-    Py_INCREF(&pgEvent_Type);
-    if (PyModule_AddObject(module, "Event", (PyObject *)&pgEvent_Type)) {
-        Py_DECREF(&pgEvent_Type);
+    if (PyModule_AddObjectRef(module, "Event", (PyObject *)&pgEvent_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/font.c

@@ -1422,16 +1422,12 @@ MODINIT_DEFINE(font)
         return NULL;
     }
 
-    Py_INCREF(&PyFont_Type);
-    if (PyModule_AddObject(module, "FontType", (PyObject *)&PyFont_Type)) {
-        Py_DECREF(&PyFont_Type);
+    if (PyModule_AddObjectRef(module, "FontType", (PyObject *)&PyFont_Type)) {
         Py_DECREF(module);
         return NULL;
     }
 
-    Py_INCREF(&PyFont_Type);
-    if (PyModule_AddObject(module, "Font", (PyObject *)&PyFont_Type)) {
-        Py_DECREF(&PyFont_Type);
+    if (PyModule_AddObjectRef(module, "Font", (PyObject *)&PyFont_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/geometry.c

@@ -40,16 +40,12 @@ MODINIT_DEFINE(geometry)
         return NULL;
     }
 
-    Py_INCREF(&pgCircle_Type);
-    if (PyModule_AddObject(module, "Circle", (PyObject *)&pgCircle_Type)) {
-        Py_DECREF(&pgCircle_Type);
+    if (PyModule_AddObjectRef(module, "Circle", (PyObject *)&pgCircle_Type)) {
         Py_DECREF(module);
         return NULL;
     }
 
-    Py_INCREF(&pgLine_Type);
-    if (PyModule_AddObject(module, "Line", (PyObject *)&pgLine_Type)) {
-        Py_DECREF(&pgLine_Type);
+    if (PyModule_AddObjectRef(module, "Line", (PyObject *)&pgLine_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/joystick.c

@@ -676,10 +676,8 @@ MODINIT_DEFINE(joystick)
         return NULL;
     }
 
-    Py_INCREF(&pgJoystick_Type);
-    if (PyModule_AddObject(module, "JoystickType",
-                           (PyObject *)&pgJoystick_Type)) {
-        Py_DECREF(&pgJoystick_Type);
+    if (PyModule_AddObjectRef(module, "JoystickType",
+                              (PyObject *)&pgJoystick_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/key.c

@@ -684,10 +684,8 @@ MODINIT_DEFINE(key)
         return NULL;
     }
 
-    Py_INCREF(&pgScancodeWrapper_Type);
-    if (PyModule_AddObject(module, _PG_SCANCODEWRAPPER_TYPE_NAME,
-                           (PyObject *)&pgScancodeWrapper_Type)) {
-        Py_DECREF(&pgScancodeWrapper_Type);
+    if (PyModule_AddObjectRef(module, _PG_SCANCODEWRAPPER_TYPE_NAME,
+                              (PyObject *)&pgScancodeWrapper_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/mask.c

@@ -2649,16 +2649,12 @@ MODINIT_DEFINE(mask)
     if (module == NULL) {
         return NULL;
     }
-    Py_INCREF(&pgMask_Type);
-    if (PyModule_AddObject(module, "MaskType", (PyObject *)&pgMask_Type)) {
-        Py_DECREF(&pgMask_Type);
+    if (PyModule_AddObjectRef(module, "MaskType", (PyObject *)&pgMask_Type)) {
         Py_DECREF(module);
         return NULL;
     }
 
-    Py_INCREF(&pgMask_Type);
-    if (PyModule_AddObject(module, "Mask", (PyObject *)&pgMask_Type)) {
-        Py_DECREF(&pgMask_Type);
+    if (PyModule_AddObjectRef(module, "Mask", (PyObject *)&pgMask_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/math.c

@@ -4573,31 +4573,15 @@ MODINIT_DEFINE(math)
     }
 
     /* add extension types to module */
-    Py_INCREF(&pgVector2_Type);
-    Py_INCREF(&pgVector3_Type);
-    Py_INCREF(&pgVectorIter_Type);
-    Py_INCREF(&pgVectorElementwiseProxy_Type);
-    if ((PyModule_AddObject(module, "Vector2", (PyObject *)&pgVector2_Type) !=
+    if ((PyModule_AddObjectRef(module, "Vector2",
+                               (PyObject *)&pgVector2_Type) < 0) ||
+        (PyModule_AddObjectRef(module, "Vector3",
+                               (PyObject *)&pgVector3_Type) < 0) ||
+        (PyModule_AddObjectRef(module, "VectorElementwiseProxy",
+                               (PyObject *)&pgVectorElementwiseProxy_Type) <
          0) ||
-        (PyModule_AddObject(module, "Vector3", (PyObject *)&pgVector3_Type) !=
-         0) ||
-        (PyModule_AddObject(module, "VectorElementwiseProxy",
-                            (PyObject *)&pgVectorElementwiseProxy_Type) !=
-         0) ||
-        (PyModule_AddObject(module, "VectorIterator",
-                            (PyObject *)&pgVectorIter_Type) != 0)) {
-        if (!PyObject_HasAttrString(module, "Vector2")) {
-            Py_DECREF(&pgVector2_Type);
-        }
-        if (!PyObject_HasAttrString(module, "Vector3")) {
-            Py_DECREF(&pgVector3_Type);
-        }
-        if (!PyObject_HasAttrString(module, "VectorElementwiseProxy")) {
-            Py_DECREF(&pgVectorElementwiseProxy_Type);
-        }
-        if (!PyObject_HasAttrString(module, "VectorIterator")) {
-            Py_DECREF(&pgVectorIter_Type);
-        }
+        (PyModule_AddObjectRef(module, "VectorIterator",
+                               (PyObject *)&pgVectorIter_Type) < 0)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/mixer.c

@@ -2101,28 +2101,22 @@ MODINIT_DEFINE(mixer)
         return NULL;
     }
 
-    Py_INCREF(&pgSound_Type);
-    if (PyModule_AddObject(module, "Sound", (PyObject *)&pgSound_Type)) {
-        Py_DECREF(&pgSound_Type);
+    if (PyModule_AddObjectRef(module, "Sound", (PyObject *)&pgSound_Type)) {
         Py_DECREF(module);
         return NULL;
     }
-    Py_INCREF(&pgSound_Type);
-    if (PyModule_AddObject(module, "SoundType", (PyObject *)&pgSound_Type)) {
-        Py_DECREF(&pgSound_Type);
+    if (PyModule_AddObjectRef(module, "SoundType",
+                              (PyObject *)&pgSound_Type)) {
         Py_DECREF(module);
         return NULL;
     }
-    Py_INCREF(&pgChannel_Type);
-    if (PyModule_AddObject(module, "ChannelType",
-                           (PyObject *)&pgChannel_Type)) {
-        Py_DECREF(&pgChannel_Type);
+    if (PyModule_AddObjectRef(module, "ChannelType",
+                              (PyObject *)&pgChannel_Type)) {
         Py_DECREF(module);
         return NULL;
     }
-    Py_INCREF(&pgChannel_Type);
-    if (PyModule_AddObject(module, "Channel", (PyObject *)&pgChannel_Type)) {
-        Py_DECREF(&pgChannel_Type);
+    if (PyModule_AddObjectRef(module, "Channel",
+                              (PyObject *)&pgChannel_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/newbuffer.c

@@ -869,16 +869,13 @@ MODINIT_DEFINE(newbuffer)
         return NULL;
     }
 
-    Py_INCREF(&BufferMixin_Type);
-    if (PyModule_AddObject(module, "BufferMixin",
-                           (PyObject *)&BufferMixin_Type)) {
-        Py_DECREF(&BufferMixin_Type);
+    if (PyModule_AddObjectRef(module, "BufferMixin",
+                              (PyObject *)&BufferMixin_Type)) {
         Py_DECREF(module);
         return NULL;
     }
-    Py_INCREF(&Py_buffer_Type);
-    if (PyModule_AddObject(module, "Py_buffer", (PyObject *)&Py_buffer_Type)) {
-        Py_DECREF(&Py_buffer_Type);
+    if (PyModule_AddObjectRef(module, "Py_buffer",
+                              (PyObject *)&Py_buffer_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/pixelarray.c

@@ -1936,10 +1936,8 @@ MODINIT_DEFINE(pixelarray)
     if (!module) {
         return NULL;
     }
-    Py_INCREF(&pgPixelArray_Type);
-    if (PyModule_AddObject(module, "PixelArray",
-                           (PyObject *)&pgPixelArray_Type)) {
-        Py_DECREF((PyObject *)&pgPixelArray_Type);
+    if (PyModule_AddObjectRef(module, "PixelArray",
+                              (PyObject *)&pgPixelArray_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/rect.c

@@ -801,27 +801,20 @@ MODINIT_DEFINE(rect)
         return NULL;
     }
 
-    Py_INCREF(&pgRect_Type);
-    if (PyModule_AddObject(module, "RectType", (PyObject *)&pgRect_Type)) {
-        Py_DECREF(&pgRect_Type);
+    if (PyModule_AddObjectRef(module, "RectType", (PyObject *)&pgRect_Type)) {
         Py_DECREF(module);
         return NULL;
     }
-    Py_INCREF(&pgRect_Type);
-    if (PyModule_AddObject(module, "Rect", (PyObject *)&pgRect_Type)) {
-        Py_DECREF(&pgRect_Type);
+    if (PyModule_AddObjectRef(module, "Rect", (PyObject *)&pgRect_Type)) {
         Py_DECREF(module);
         return NULL;
     }
-    Py_INCREF(&pgFRect_Type);
-    if (PyModule_AddObject(module, "FRectType", (PyObject *)&pgFRect_Type)) {
-        Py_DECREF(&pgFRect_Type);
+    if (PyModule_AddObjectRef(module, "FRectType",
+                              (PyObject *)&pgFRect_Type)) {
         Py_DECREF(module);
         return NULL;
     }
-    Py_INCREF(&pgFRect_Type);
-    if (PyModule_AddObject(module, "FRect", (PyObject *)&pgFRect_Type)) {
-        Py_DECREF(&pgFRect_Type);
+    if (PyModule_AddObjectRef(module, "FRect", (PyObject *)&pgFRect_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/render.c

@@ -91,23 +91,19 @@ MODINIT_DEFINE(_render)
         return NULL;
     }
 
-    Py_INCREF(&pgRenderer_Type);
-    if (PyModule_AddObject(module, "Renderer", (PyObject *)&pgRenderer_Type)) {
-        Py_DECREF(&pgRenderer_Type);
+    if (PyModule_AddObjectRef(module, "Renderer",
+                              (PyObject *)&pgRenderer_Type)) {
         Py_DECREF(module);
         return NULL;
     }
 
-    Py_INCREF(&pgTexture_Type);
-    if (PyModule_AddObject(module, "Texture", (PyObject *)&pgTexture_Type)) {
-        Py_DECREF(&pgTexture_Type);
+    if (PyModule_AddObjectRef(module, "Texture",
+                              (PyObject *)&pgTexture_Type)) {
         Py_DECREF(module);
         return NULL;
     }
 
-    Py_INCREF(&pgImage_Type);
-    if (PyModule_AddObject(module, "Image", (PyObject *)&pgImage_Type)) {
-        Py_DECREF(&pgImage_Type);
+    if (PyModule_AddObjectRef(module, "Image", (PyObject *)&pgImage_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/surface.c

@@ -4327,17 +4327,14 @@ MODINIT_DEFINE(surface)
         Py_DECREF(module);
         return NULL;
     }
-    Py_INCREF(&pgSurface_Type);
-    if (PyModule_AddObject(module, "SurfaceType",
-                           (PyObject *)&pgSurface_Type)) {
-        Py_DECREF(&pgSurface_Type);
+    if (PyModule_AddObjectRef(module, "SurfaceType",
+                              (PyObject *)&pgSurface_Type)) {
         Py_DECREF(module);
         return NULL;
     }
 
-    Py_INCREF(&pgSurface_Type);
-    if (PyModule_AddObject(module, "Surface", (PyObject *)&pgSurface_Type)) {
-        Py_DECREF(&pgSurface_Type);
+    if (PyModule_AddObjectRef(module, "Surface",
+                              (PyObject *)&pgSurface_Type)) {
         Py_DECREF(module);
         return NULL;
     }
@@ -4353,9 +4350,7 @@ MODINIT_DEFINE(surface)
         Py_DECREF(module);
         return NULL;
     }
-    Py_XINCREF(pgSurface_Type.tp_dict);
-    if (PyModule_AddObject(module, "_dict", pgSurface_Type.tp_dict)) {
-        Py_XDECREF(pgSurface_Type.tp_dict);
+    if (PyModule_AddObjectRef(module, "_dict", pgSurface_Type.tp_dict)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/time.c

@@ -754,9 +754,7 @@ MODINIT_DEFINE(time)
         return NULL;
     }
 
-    Py_INCREF(&PyClock_Type);
-    if (PyModule_AddObject(module, "Clock", (PyObject *)&PyClock_Type)) {
-        Py_DECREF(&PyClock_Type);
+    if (PyModule_AddObjectRef(module, "Clock", (PyObject *)&PyClock_Type)) {
         Py_DECREF(module);
         return NULL;
     }