python
diff --git a/‎Modules/cjkcodecs/multibytecodec.c‎
Lines changed: 7 additions & 14 deletions b/‎Modules/cjkcodecs/multibytecodec.c‎
Lines changed: 7 additions & 14 deletions
diff --git a/‎Modules/gcmodule.c‎
Lines changed: 1 addition & 2 deletions b/‎Modules/gcmodule.c‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎Modules/getpath.c‎
Lines changed: 10 additions & 19 deletions b/‎Modules/getpath.c‎
Lines changed: 10 additions & 19 deletions
diff --git a/‎Modules/mathmodule.c‎
Lines changed: 2 additions & 4 deletions b/‎Modules/mathmodule.c‎
Lines changed: 2 additions & 4 deletions
diff --git a/‎Modules/ossaudiodev.c‎
Lines changed: 3 additions & 6 deletions b/‎Modules/ossaudiodev.c‎
Lines changed: 3 additions & 6 deletions
diff --git a/‎Modules/overlapped.c‎
Lines changed: 4 additions & 8 deletions b/‎Modules/overlapped.c‎
Lines changed: 4 additions & 8 deletions
@@ -141,8 +141,7 @@ codecctx_errors_get(MultibyteStatefulCodecContext *self, void *Py_UNUSED(ignored
     else if (self->errors == ERROR_REPLACE)
         errors = "replace";
     else {
-        Py_INCREF(self->errors);
-        return self->errors;
+        return Py_NewRef(self->errors);
     }
 
     return PyUnicode_FromString(errors);
@@ -341,8 +340,7 @@ multibytecodec_encerror(MultibyteCodec *codec,
             goto errorexit;
     }
     else {
-        Py_INCREF(tobj);
-        retstr = tobj;
+        retstr = Py_NewRef(tobj);
     }
 
     assert(PyBytes_Check(retstr));
@@ -786,11 +784,9 @@ encoder_encode_stateful(MultibyteStatefulEncoderContext *ctx,
     if (ctx->pending) {
         PyObject *inbuf_tmp;
 
-        Py_INCREF(ctx->pending);
-        origpending = ctx->pending;
+        origpending = Py_NewRef(ctx->pending);
 
-        Py_INCREF(ctx->pending);
-        inbuf_tmp = ctx->pending;
+        inbuf_tmp = Py_NewRef(ctx->pending);
         PyUnicode_Append(&inbuf_tmp, unistr);
         if (inbuf_tmp == NULL)
             goto errorexit;
@@ -800,8 +796,7 @@ encoder_encode_stateful(MultibyteStatefulEncoderContext *ctx,
     else {
         origpending = NULL;
 
-        Py_INCREF(unistr);
-        inbuf = unistr;
+        inbuf = Py_NewRef(unistr);
     }
     if (PyUnicode_READY(inbuf) < 0)
         goto errorexit;
@@ -1645,8 +1640,7 @@ mbstreamreader_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     }
 
     self->codec = ((MultibyteCodecObject *)codec)->codec;
-    self->stream = stream;
-    Py_INCREF(stream);
+    self->stream = Py_NewRef(stream);
     self->pendingsize = 0;
     self->errors = internal_error_callback(errors);
     if (self->errors == NULL)
@@ -1869,8 +1863,7 @@ mbstreamwriter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     }
 
     self->codec = ((MultibyteCodecObject *)codec)->codec;
-    self->stream = stream;
-    Py_INCREF(stream);
+    self->stream = Py_NewRef(stream);
     self->pending = NULL;
     self->errors = internal_error_callback(errors);
     if (self->errors == NULL)
 
@@ -1870,8 +1870,7 @@ gc_is_tracked(PyObject *module, PyObject *obj)
         result = Py_True;
     else
         result = Py_False;
-    Py_INCREF(result);
-    return result;
+    return Py_NewRef(result);
 }
 
 /*[clinic input]
 
@@ -125,8 +125,7 @@ getpath_isabs(PyObject *Py_UNUSED(self), PyObject *args)
         r = _Py_isabs(path) ? Py_True : Py_False;
         PyMem_Free((void *)path);
     }
-    Py_XINCREF(r);
-    return r;
+    return Py_XNewRef(r);
 }
 
 
@@ -153,11 +152,10 @@ getpath_hassuffix(PyObject *Py_UNUSED(self), PyObject *args)
                 wcscmp(&path[len - suffixLen], suffix) != 0
 #endif
             ) {
-                r = Py_False;
+                r = Py_NewRef(Py_False);
             } else {
-                r = Py_True;
+                r = Py_NewRef(Py_True);
             }
-            Py_INCREF(r);
             PyMem_Free((void *)suffix);
         }
         PyMem_Free((void *)path);
@@ -187,8 +185,7 @@ getpath_isdir(PyObject *Py_UNUSED(self), PyObject *args)
 #endif
         PyMem_Free((void *)path);
     }
-    Py_XINCREF(r);
-    return r;
+    return Py_XNewRef(r);
 }
 
 
@@ -213,8 +210,7 @@ getpath_isfile(PyObject *Py_UNUSED(self), PyObject *args)
 #endif
         PyMem_Free((void *)path);
     }
-    Py_XINCREF(r);
-    return r;
+    return Py_XNewRef(r);
 }
 
 
@@ -247,8 +243,7 @@ getpath_isxfile(PyObject *Py_UNUSED(self), PyObject *args)
 #endif
         PyMem_Free((void *)path);
     }
-    Py_XINCREF(r);
-    return r;
+    return Py_XNewRef(r);
 }
 
 
@@ -488,8 +483,7 @@ getpath_realpath(PyObject *Py_UNUSED(self) , PyObject *args)
         goto done;
     }
     if (!S_ISLNK(st.st_mode)) {
-        Py_INCREF(pathobj);
-        r = pathobj;
+        r = Py_NewRef(pathobj);
         goto done;
     }
     wchar_t resolved[MAXPATHLEN+1];
@@ -504,8 +498,7 @@ getpath_realpath(PyObject *Py_UNUSED(self) , PyObject *args)
     return r;
 #endif
 
-    Py_INCREF(pathobj);
-    return pathobj;
+    return Py_NewRef(pathobj);
 }
 
 
@@ -591,8 +584,7 @@ wchar_to_dict(PyObject *dict, const char *key, const wchar_t *s)
             return 0;
         }
     } else {
-        u = Py_None;
-        Py_INCREF(u);
+        u = Py_NewRef(Py_None);
     }
     r = PyDict_SetItemString(dict, key, u) == 0;
     Py_DECREF(u);
@@ -617,8 +609,7 @@ decode_to_dict(PyObject *dict, const char *key, const char *s)
             return 0;
         }
     } else {
-        u = Py_None;
-        Py_INCREF(u);
+        u = Py_NewRef(Py_None);
     }
     r = PyDict_SetItemString(dict, key, u) == 0;
     Py_DECREF(u);
 
@@ -2048,8 +2048,7 @@ factorial_odd_part(unsigned long n)
     inner = PyLong_FromLong(1);
     if (inner == NULL)
         return NULL;
-    outer = inner;
-    Py_INCREF(outer);
+    outer = Py_NewRef(inner);
 
     upper = 3;
     for (i = _Py_bit_length(n) - 2; i >= 0; i--) {
@@ -3521,8 +3520,7 @@ perm_comb(PyObject *n, unsigned long long k, int iscomb)
         return PyLong_FromLong(1);
     }
     if (k == 1) {
-        Py_INCREF(n);
-        return n;
+        return Py_NewRef(n);
     }
 
     /* P(n, k) = P(n, j) * P(n-j, k-j) */
 
@@ -534,8 +534,7 @@ oss_close(oss_audio_t *self, PyObject *unused)
 static PyObject *
 oss_self(PyObject *self, PyObject *unused)
 {
-    Py_INCREF(self);
-    return self;
+    return Py_NewRef(self);
 }
 
 static PyObject *
@@ -1135,10 +1134,8 @@ PyInit_ossaudiodev(void)
                                        NULL, NULL);
     if (OSSAudioError) {
         /* Each call to PyModule_AddObject decrefs it; compensate: */
-        Py_INCREF(OSSAudioError);
-        Py_INCREF(OSSAudioError);
-        PyModule_AddObject(m, "error", OSSAudioError);
-        PyModule_AddObject(m, "OSSAudioError", OSSAudioError);
+        PyModule_AddObject(m, "error", Py_NewRef(OSSAudioError));
+        PyModule_AddObject(m, "OSSAudioError", Py_NewRef(OSSAudioError));
     }
 
     /* Build 'control_labels' and 'control_names' lists and add them
 
@@ -912,8 +912,7 @@ _overlapped_Overlapped_getresult_impl(OverlappedObject *self, BOOL wait)
                 _PyBytes_Resize(&self->allocated_buffer, transferred))
                 return NULL;
 
-            Py_INCREF(self->allocated_buffer);
-            return self->allocated_buffer;
+            return Py_NewRef(self->allocated_buffer);
         case TYPE_READ_FROM:
             assert(PyBytes_CheckExact(self->read_from.allocated_buffer));
 
@@ -940,14 +939,12 @@ _overlapped_Overlapped_getresult_impl(OverlappedObject *self, BOOL wait)
             }
 
             // first item: message
-            Py_INCREF(self->read_from.allocated_buffer);
             PyTuple_SET_ITEM(self->read_from.result, 0,
-                             self->read_from.allocated_buffer);
+                             Py_NewRef(self->read_from.allocated_buffer));
             // second item: address
             PyTuple_SET_ITEM(self->read_from.result, 1, addr);
 
-            Py_INCREF(self->read_from.result);
-            return self->read_from.result;
+            return Py_NewRef(self->read_from.result);
         case TYPE_READ_FROM_INTO:
             // unparse the address
             addr = unparse_address((SOCKADDR*)&self->read_from_into.address,
@@ -970,8 +967,7 @@ _overlapped_Overlapped_getresult_impl(OverlappedObject *self, BOOL wait)
             // second item: address
             PyTuple_SET_ITEM(self->read_from_into.result, 1, addr);
 
-            Py_INCREF(self->read_from_into.result);
-            return self->read_from_into.result;
+            return Py_NewRef(self->read_from_into.result);
         default:
             return PyLong_FromUnsignedLong((unsigned long) transferred);
     }
Original file line number	Diff line number	Diff line change
`@@ -1870,8 +1870,7 @@ gc_is_tracked(PyObject module, PyObject obj)`
`1870`	`1870`	`result = Py_True;`
`1871`	`1871`	`else`
`1872`	`1872`	`result = Py_False;`
`1873`		`- Py_INCREF(result);`
`1874`		`- return result;`
	`1873`	`+ return Py_NewRef(result);`
`1875`	`1874`	`}`
`1876`	`1875`
`1877`	`1876`	`/*[clinic input]`
Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,7 @@ getpath_isabs(PyObject Py_UNUSED(self), PyObject args)`
`125`	`125`	`r = _Py_isabs(path) ? Py_True : Py_False;`
`126`	`126`	`PyMem_Free((void *)path);`
`127`	`127`	`}`
`128`		`- Py_XINCREF(r);`
`129`		`- return r;`
	`128`	`+ return Py_XNewRef(r);`
`130`	`129`	`}`
`131`	`130`
`132`	`131`
`@@ -153,11 +152,10 @@ getpath_hassuffix(PyObject Py_UNUSED(self), PyObject args)`
`153`	`152`	`wcscmp(&path[len - suffixLen], suffix) != 0`
`154`	`153`	`#endif`
`155`	`154`	`) {`
`156`		`- r = Py_False;`
	`155`	`+ r = Py_NewRef(Py_False);`
`157`	`156`	`} else {`
`158`		`- r = Py_True;`
	`157`	`+ r = Py_NewRef(Py_True);`
`159`	`158`	`}`
`160`		`- Py_INCREF(r);`
`161`	`159`	`PyMem_Free((void *)suffix);`
`162`	`160`	`}`
`163`	`161`	`PyMem_Free((void *)path);`
`@@ -187,8 +185,7 @@ getpath_isdir(PyObject Py_UNUSED(self), PyObject args)`
`187`	`185`	`#endif`
`188`	`186`	`PyMem_Free((void *)path);`
`189`	`187`	`}`
`190`		`- Py_XINCREF(r);`
`191`		`- return r;`
	`188`	`+ return Py_XNewRef(r);`
`192`	`189`	`}`
`193`	`190`
`194`	`191`
`@@ -213,8 +210,7 @@ getpath_isfile(PyObject Py_UNUSED(self), PyObject args)`
`213`	`210`	`#endif`
`214`	`211`	`PyMem_Free((void *)path);`
`215`	`212`	`}`
`216`		`- Py_XINCREF(r);`
`217`		`- return r;`
	`213`	`+ return Py_XNewRef(r);`
`218`	`214`	`}`
`219`	`215`
`220`	`216`
`@@ -247,8 +243,7 @@ getpath_isxfile(PyObject Py_UNUSED(self), PyObject args)`
`247`	`243`	`#endif`
`248`	`244`	`PyMem_Free((void *)path);`
`249`	`245`	`}`
`250`		`- Py_XINCREF(r);`
`251`		`- return r;`
	`246`	`+ return Py_XNewRef(r);`
`252`	`247`	`}`
`253`	`248`
`254`	`249`
`@@ -488,8 +483,7 @@ getpath_realpath(PyObject Py_UNUSED(self) , PyObject args)`
`488`	`483`	`goto done;`
`489`	`484`	`}`
`490`	`485`	`if (!S_ISLNK(st.st_mode)) {`
`491`		`- Py_INCREF(pathobj);`
`492`		`- r = pathobj;`
	`486`	`+ r = Py_NewRef(pathobj);`
`493`	`487`	`goto done;`
`494`	`488`	`}`
`495`	`489`	`wchar_t resolved[MAXPATHLEN+1];`
`@@ -504,8 +498,7 @@ getpath_realpath(PyObject Py_UNUSED(self) , PyObject args)`
`504`	`498`	`return r;`
`505`	`499`	`#endif`
`506`	`500`
`507`		`- Py_INCREF(pathobj);`
`508`		`- return pathobj;`
	`501`	`+ return Py_NewRef(pathobj);`
`509`	`502`	`}`
`510`	`503`
`511`	`504`
`@@ -591,8 +584,7 @@ wchar_to_dict(PyObject dict, const char key, const wchar_t *s)`
`591`	`584`	`return 0;`
`592`	`585`	`}`
`593`	`586`	`} else {`
`594`		`- u = Py_None;`
`595`		`- Py_INCREF(u);`
	`587`	`+ u = Py_NewRef(Py_None);`
`596`	`588`	`}`
`597`	`589`	`r = PyDict_SetItemString(dict, key, u) == 0;`
`598`	`590`	`Py_DECREF(u);`
`@@ -617,8 +609,7 @@ decode_to_dict(PyObject dict, const char key, const char *s)`
`617`	`609`	`return 0;`
`618`	`610`	`}`
`619`	`611`	`} else {`
`620`		`- u = Py_None;`
`621`		`- Py_INCREF(u);`
	`612`	`+ u = Py_NewRef(Py_None);`
`622`	`613`	`}`
`623`	`614`	`r = PyDict_SetItemString(dict, key, u) == 0;`
`624`	`615`	`Py_DECREF(u);`