Skip to content

Commit f67ce18

Browse files
MightyJosipMightyJosip
committed
Replace AddObject with AddObjectRef
1 parent 74043a6 commit f67ce18

25 files changed

+87
-193
lines changed

‎src_c/_camera.c‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1988,15 +1988,12 @@ MODINIT_DEFINE(_camera)
19881988
return NULL;
19891989
}
19901990

1991-
Py_INCREF(&pgCamera_Type);
1992-
if (PyModule_AddObject(module, "CameraType", (PyObject *)&pgCamera_Type)) {
1993-
Py_DECREF(&pgCamera_Type);
1991+
if (PyModule_AddObjectRef(module, "CameraType",
1992+
(PyObject *)&pgCamera_Type)) {
19941993
Py_DECREF(module);
19951994
return NULL;
19961995
}
1997-
Py_INCREF(&pgCamera_Type);
1998-
if (PyModule_AddObject(module, "Camera", (PyObject *)&pgCamera_Type)) {
1999-
Py_DECREF(&pgCamera_Type);
1996+
if (PyModule_AddObjectRef(module, "Camera", (PyObject *)&pgCamera_Type)) {
20001997
Py_DECREF(module);
20011998
return NULL;
20021999
}

‎src_c/_freetype.c‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2383,9 +2383,8 @@ MODINIT_DEFINE(_freetype)
23832383
FREETYPE_MOD_STATE(module)->cache_size = 0;
23842384
FREETYPE_MOD_STATE(module)->resolution = PGFT_DEFAULT_RESOLUTION;
23852385

2386-
Py_INCREF(&pgFont_Type);
2387-
if (PyModule_AddObject(module, FONT_TYPE_NAME, (PyObject *)&pgFont_Type)) {
2388-
Py_DECREF(&pgFont_Type);
2386+
if (PyModule_AddObjectRef(module, FONT_TYPE_NAME,
2387+
(PyObject *)&pgFont_Type)) {
23892388
Py_DECREF(module);
23902389
return NULL;
23912390
}
@@ -2416,8 +2415,7 @@ MODINIT_DEFINE(_freetype)
24162415
c_api[1] = &pgFont_New;
24172416

24182417
apiobj = encapsulate_api(c_api, "freetype");
2419-
if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
2420-
Py_XDECREF(apiobj);
2418+
if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
24212419
Py_DECREF(module);
24222420
return NULL;
24232421
}

‎src_c/base.c‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2396,17 +2396,14 @@ MODINIT_DEFINE(base)
23962396
/* create the exceptions */
23972397
pgExc_SDLError =
23982398
PyErr_NewException("pygame.error", PyExc_RuntimeError, NULL);
2399-
if (PyModule_AddObject(module, "error", pgExc_SDLError)) {
2400-
Py_XDECREF(pgExc_SDLError);
2399+
if (PyModule_AddObjectRef(module, "error", pgExc_SDLError)) {
24012400
goto error;
24022401
}
24032402

24042403
pgExc_BufferError =
24052404
PyErr_NewException("pygame.BufferError", PyExc_BufferError, NULL);
24062405
/* Because we need a reference to BufferError in the base module */
2407-
Py_XINCREF(pgExc_BufferError);
2408-
if (PyModule_AddObject(module, "BufferError", pgExc_BufferError)) {
2409-
Py_XDECREF(pgExc_BufferError);
2406+
if (PyModule_AddObjectRef(module, "BufferError", pgExc_BufferError)) {
24102407
goto error;
24112408
}
24122409

@@ -2449,8 +2446,7 @@ MODINIT_DEFINE(base)
24492446
#endif
24502447

24512448
apiobj = encapsulate_api(c_api, "base");
2452-
if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
2453-
Py_XDECREF(apiobj);
2449+
if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
24542450
goto error;
24552451
}
24562452

@@ -2464,8 +2460,7 @@ MODINIT_DEFINE(base)
24642460
if (!version) {
24652461
goto error;
24662462
}
2467-
if (PyModule_AddObject(module, "__version__", version)) {
2468-
Py_DECREF(version);
2463+
if (PyModule_AddObjectRef(module, "__version__", version)) {
24692464
goto error;
24702465
}
24712466

‎src_c/bufferproxy.c‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -604,10 +604,8 @@ MODINIT_DEFINE(bufferproxy)
604604
return NULL;
605605
}
606606

607-
Py_INCREF(&pgBufferProxy_Type);
608-
if (PyModule_AddObject(module, "BufferProxy",
609-
(PyObject *)&pgBufferProxy_Type)) {
610-
Py_DECREF(&pgBufferProxy_Type);
607+
if (PyModule_AddObjectRef(module, "BufferProxy",
608+
(PyObject *)&pgBufferProxy_Type)) {
611609
Py_DECREF(module);
612610
return NULL;
613611
}
@@ -619,8 +617,7 @@ MODINIT_DEFINE(bufferproxy)
619617
c_api[2] = pgBufferProxy_GetParent;
620618
c_api[3] = pgBufferProxy_Trip;
621619
apiobj = encapsulate_api(c_api, "bufferproxy");
622-
if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
623-
Py_XDECREF(apiobj);
620+
if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
624621
Py_DECREF(module);
625622
return NULL;
626623
}

‎src_c/color.c‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2485,15 +2485,10 @@ MODINIT_DEFINE(color)
24852485
goto error;
24862486
}
24872487

2488-
Py_INCREF(&pgColor_Type);
2489-
if (PyModule_AddObject(module, "Color", (PyObject *)&pgColor_Type)) {
2490-
Py_DECREF(&pgColor_Type);
2488+
if (PyModule_AddObjectRef(module, "Color", (PyObject *)&pgColor_Type)) {
24912489
goto error;
24922490
}
2493-
Py_INCREF(_COLORDICT);
2494-
if (PyModule_AddObject(module, "THECOLORS", _COLORDICT)) {
2495-
/* Yes, _COLORDICT is decref'd twice here and we want that */
2496-
Py_DECREF(_COLORDICT);
2491+
if (PyModule_AddObjectRef(module, "THECOLORS", _COLORDICT)) {
24972492
goto error;
24982493
}
24992494

@@ -2504,8 +2499,7 @@ MODINIT_DEFINE(color)
25042499
c_api[4] = pg_MappedColorFromObj;
25052500

25062501
apiobj = encapsulate_api(c_api, "color");
2507-
if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
2508-
Py_XDECREF(apiobj);
2502+
if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
25092503
goto error;
25102504
}
25112505
return module;

‎src_c/constants.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -648,8 +648,7 @@ MODINIT_DEFINE(constants)
648648
DEC_CONSTS(FLASH_UNTIL_FOCUSED, -1);
649649
#endif
650650

651-
if (PyModule_AddObject(module, "__all__", all_list)) {
652-
Py_DECREF(all_list);
651+
if (PyModule_AddObjectRef(module, "__all__", all_list)) {
653652
Py_DECREF(module);
654653
return NULL;
655654
}

‎src_c/event.c‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2578,15 +2578,12 @@ MODINIT_DEFINE(event)
25782578
return NULL;
25792579
}
25802580

2581-
Py_INCREF(&pgEvent_Type);
2582-
if (PyModule_AddObject(module, "EventType", (PyObject *)&pgEvent_Type)) {
2583-
Py_DECREF(&pgEvent_Type);
2581+
if (PyModule_AddObjectRef(module, "EventType",
2582+
(PyObject *)&pgEvent_Type)) {
25842583
Py_DECREF(module);
25852584
return NULL;
25862585
}
2587-
Py_INCREF(&pgEvent_Type);
2588-
if (PyModule_AddObject(module, "Event", (PyObject *)&pgEvent_Type)) {
2589-
Py_DECREF(&pgEvent_Type);
2586+
if (PyModule_AddObjectRef(module, "Event", (PyObject *)&pgEvent_Type)) {
25902587
Py_DECREF(module);
25912588
return NULL;
25922589
}
@@ -2605,8 +2602,7 @@ MODINIT_DEFINE(event)
26052602
c_api[9] = pgEvent_GetMouseButtonUpInfo;
26062603

26072604
apiobj = encapsulate_api(c_api, "event");
2608-
if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
2609-
Py_XDECREF(apiobj);
2605+
if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
26102606
Py_DECREF(module);
26112607
return NULL;
26122608
}

‎src_c/font.c‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,16 +1422,12 @@ MODINIT_DEFINE(font)
14221422
return NULL;
14231423
}
14241424

1425-
Py_INCREF(&PyFont_Type);
1426-
if (PyModule_AddObject(module, "FontType", (PyObject *)&PyFont_Type)) {
1427-
Py_DECREF(&PyFont_Type);
1425+
if (PyModule_AddObjectRef(module, "FontType", (PyObject *)&PyFont_Type)) {
14281426
Py_DECREF(module);
14291427
return NULL;
14301428
}
14311429

1432-
Py_INCREF(&PyFont_Type);
1433-
if (PyModule_AddObject(module, "Font", (PyObject *)&PyFont_Type)) {
1434-
Py_DECREF(&PyFont_Type);
1430+
if (PyModule_AddObjectRef(module, "Font", (PyObject *)&PyFont_Type)) {
14351431
Py_DECREF(module);
14361432
return NULL;
14371433
}
@@ -1448,9 +1444,7 @@ MODINIT_DEFINE(font)
14481444
c_api[0] = &PyFont_Type;
14491445
c_api[1] = PyFont_New;
14501446
c_api[2] = &font_initialized;
1451-
apiobj = encapsulate_api(c_api, "font");
1452-
if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
1453-
Py_XDECREF(apiobj);
1447+
if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
14541448
Py_DECREF(module);
14551449
return NULL;
14561450
}

‎src_c/geometry.c‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,20 @@ MODINIT_DEFINE(geometry)
4040
return NULL;
4141
}
4242

43-
Py_INCREF(&pgCircle_Type);
44-
if (PyModule_AddObject(module, "Circle", (PyObject *)&pgCircle_Type)) {
45-
Py_DECREF(&pgCircle_Type);
43+
if (PyModule_AddObjectRef(module, "Circle", (PyObject *)&pgCircle_Type)) {
4644
Py_DECREF(module);
4745
return NULL;
4846
}
4947

50-
Py_INCREF(&pgLine_Type);
51-
if (PyModule_AddObject(module, "Line", (PyObject *)&pgLine_Type)) {
52-
Py_DECREF(&pgLine_Type);
48+
if (PyModule_AddObjectRef(module, "Line", (PyObject *)&pgLine_Type)) {
5349
Py_DECREF(module);
5450
return NULL;
5551
}
5652

5753
c_api[0] = &pgCircle_Type;
5854
c_api[1] = &pgLine_Type;
5955
apiobj = encapsulate_api(c_api, "geometry");
60-
if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
61-
Py_XDECREF(apiobj);
56+
if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
6257
Py_DECREF(module);
6358
return NULL;
6459
}

‎src_c/joystick.c‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -676,10 +676,8 @@ MODINIT_DEFINE(joystick)
676676
return NULL;
677677
}
678678

679-
Py_INCREF(&pgJoystick_Type);
680-
if (PyModule_AddObject(module, "JoystickType",
681-
(PyObject *)&pgJoystick_Type)) {
682-
Py_DECREF(&pgJoystick_Type);
679+
if (PyModule_AddObjectRef(module, "JoystickType",
680+
(PyObject *)&pgJoystick_Type)) {
683681
Py_DECREF(module);
684682
return NULL;
685683
}
@@ -689,8 +687,7 @@ MODINIT_DEFINE(joystick)
689687
c_api[1] = pgJoystick_New;
690688
c_api[2] = pgJoystick_GetDeviceIndexByInstanceID;
691689
apiobj = encapsulate_api(c_api, "joystick");
692-
if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
693-
Py_XDECREF(apiobj);
690+
if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
694691
Py_DECREF(module);
695692
return NULL;
696693
}

0 commit comments

Comments
 (0)