Use PyModule_AddType

Not exhaustive, but gets in most places it's immediately practical to.

Author: Starbuck5

src_c/_freetype.c

@@ -2368,11 +2368,6 @@ MODINIT_DEFINE(_freetype)
         return NULL;
     }
 
-    /* type preparation */
-    if (PyType_Ready(&pgFont_Type) < 0) {
-        return NULL;
-    }
-
     module = PyModule_Create(&_freetypemodule);
 
     if (!module) {
@@ -2383,8 +2378,7 @@ MODINIT_DEFINE(_freetype)
     FREETYPE_MOD_STATE(module)->cache_size = 0;
     FREETYPE_MOD_STATE(module)->resolution = PGFT_DEFAULT_RESOLUTION;
 
-    if (PyModule_AddObjectRef(module, FONT_TYPE_NAME,
-                              (PyObject *)&pgFont_Type)) {
+    if (PyModule_AddType(module, &pgFont_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/_sdl2/controller.c

@@ -584,14 +584,7 @@ MODINIT_DEFINE(controller)
         return NULL;
     }
 
-    if (PyType_Ready(&pgController_Type) < 0) {
-        return NULL;
-    }
-
-    Py_INCREF(&pgController_Type);
-    if (PyModule_AddObject(module, "Controller",
-                           (PyObject *)&pgController_Type)) {
-        Py_DECREF(&pgController_Type);
+    if (PyModule_AddType(module, &pgController_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/bufferproxy.c

@@ -591,11 +591,6 @@ MODINIT_DEFINE(bufferproxy)
         return NULL;
     }
 
-    /* prepare exported types */
-    if (PyType_Ready(&pgBufferProxy_Type) < 0) {
-        return NULL;
-    }
-
 #define bufferproxy_docs ""
 
     /* create the module */
@@ -604,8 +599,7 @@ MODINIT_DEFINE(bufferproxy)
         return NULL;
     }
 
-    if (PyModule_AddObjectRef(module, "BufferProxy",
-                              (PyObject *)&pgBufferProxy_Type)) {
+    if (PyModule_AddType(module, &pgBufferProxy_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/color.c

@@ -2516,18 +2516,13 @@ MODINIT_DEFINE(color)
         return NULL;
     }
 
-    /* type preparation */
-    if (PyType_Ready(&pgColor_Type) < 0) {
-        goto error;
-    }
-
     /* create the module */
     module = PyModule_Create(&_module);
     if (!module) {
         goto error;
     }
 
-    if (PyModule_AddObjectRef(module, "Color", (PyObject *)&pgColor_Type)) {
+    if (PyModule_AddType(module, &pgColor_Type)) {
         goto error;
     }
     if (PyModule_AddObjectRef(module, "THECOLORS", _COLORDICT)) {

src_c/geometry.c

@@ -27,25 +27,17 @@ MODINIT_DEFINE(geometry)
         return NULL;
     }
 
-    if (PyType_Ready(&pgCircle_Type) < 0) {
-        return NULL;
-    }
-
-    if (PyType_Ready(&pgLine_Type) < 0) {
-        return NULL;
-    }
-
     module = PyModule_Create(&_module);
     if (!module) {
         return NULL;
     }
 
-    if (PyModule_AddObjectRef(module, "Circle", (PyObject *)&pgCircle_Type)) {
+    if (PyModule_AddType(module, &pgCircle_Type)) {
         Py_DECREF(module);
         return NULL;
     }
 
-    if (PyModule_AddObjectRef(module, "Line", (PyObject *)&pgLine_Type)) {
+    if (PyModule_AddType(module, &pgLine_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/newbuffer.c

@@ -853,14 +853,6 @@ MODINIT_DEFINE(newbuffer)
                                          NULL,
                                          NULL};
 
-    /* prepare exported types */
-    if (PyType_Ready(&Py_buffer_Type) < 0) {
-        return NULL;
-    }
-    if (PyType_Ready(&BufferMixin_Type) < 0) {
-        return NULL;
-    }
-
 #define bufferproxy_docs ""
 
     /* create the module */
@@ -869,13 +861,11 @@ MODINIT_DEFINE(newbuffer)
         return NULL;
     }
 
-    if (PyModule_AddObjectRef(module, "BufferMixin",
-                              (PyObject *)&BufferMixin_Type)) {
+    if (PyModule_AddType(module, &BufferMixin_Type)) {
         Py_DECREF(module);
         return NULL;
     }
-    if (PyModule_AddObjectRef(module, "Py_buffer",
-                              (PyObject *)&Py_buffer_Type)) {
+    if (PyModule_AddType(module, &Py_buffer_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/pixelarray.c

@@ -1926,18 +1926,12 @@ MODINIT_DEFINE(pixelarray)
         return NULL;
     }
 
-    /* type preparation */
-    if (PyType_Ready(&pgPixelArray_Type)) {
-        return NULL;
-    }
-
     /* create the module */
     module = PyModule_Create(&_module);
     if (!module) {
         return NULL;
     }
-    if (PyModule_AddObjectRef(module, "PixelArray",
-                              (PyObject *)&pgPixelArray_Type)) {
+    if (PyModule_AddType(module, &pgPixelArray_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/time.c

@@ -743,18 +743,13 @@ MODINIT_DEFINE(time)
         return NULL;
     }
 
-    /* type preparation */
-    if (PyType_Ready(&PyClock_Type) < 0) {
-        return NULL;
-    }
-
     /* create the module */
     module = PyModule_Create(&_module);
     if (!module) {
         return NULL;
     }
 
-    if (PyModule_AddObjectRef(module, "Clock", (PyObject *)&PyClock_Type)) {
+    if (PyModule_AddType(module, &PyClock_Type)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/window.c

@@ -1491,17 +1491,13 @@ MODINIT_DEFINE(window)
         return NULL;
     }
 
-    if (PyType_Ready(&pgWindow_Type) < 0) {
-        return NULL;
-    }
-
     /* create the module */
     module = PyModule_Create(&_module);
     if (module == 0) {
         return NULL;
     }
 
-    if (PyModule_AddObjectRef(module, "Window", (PyObject *)&pgWindow_Type)) {
+    if (PyModule_AddType(module, &pgWindow_Type)) {
         Py_DECREF(module);
         return NULL;
     }