Merge pull request #3406 from MightyJosip/AddObjectRef

Replace AddObject() with AddObjectRef()

Author: zoldalma999

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

@@ -2521,15 +2521,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

@@ -1455,16 +1455,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;
     }