1 files changed, 10 insertions, 24 deletions

diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c
index caae5c4e122..195442d34f6 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -207,7 +207,7 @@ PyObject *PyC_Tuple_PackArray_Bool(const bool *array, uint len)
  */
 void PyC_Tuple_Fill(PyObject *tuple, PyObject *value)
 {
-  uint tot = PyTuple_GET_SIZE(tuple);
+  const uint tot = PyTuple_GET_SIZE(tuple);
   uint i;
 
   for (i = 0; i < tot; i++) {
@@ -218,7 +218,7 @@ void PyC_Tuple_Fill(PyObject *tuple, PyObject *value)
 
 void PyC_List_Fill(PyObject *list, PyObject *value)
 {
-  uint tot = PyList_GET_SIZE(list);
+  const uint tot = PyList_GET_SIZE(list);
   uint i;
 
   for (i = 0; i < tot; i++) {
@@ -377,25 +377,11 @@ void PyC_StackSpit(void)
   }
 
   /* lame but handy */
-  PyGILState_STATE gilstate = PyGILState_Ensure();
+  const PyGILState_STATE gilstate = PyGILState_Ensure();
   PyRun_SimpleString("__import__('traceback').print_stack()");
   PyGILState_Release(gilstate);
 }
 
-void PyC_StackPrint(/* FILE */ void *fp)
-{
-  PyThreadState *tstate = PyGILState_GetThisThreadState();
-  if (tstate != NULL && tstate->frame != NULL) {
-    PyFrameObject *frame = tstate->frame;
-    do {
-      const int line = PyCode_Addr2Line(frame->f_code, frame->f_lasti);
-      const char *filename = _PyUnicode_AsString(frame->f_code->co_filename);
-      const char *funcname = _PyUnicode_AsString(frame->f_code->co_name);
-      fprintf(fp, "  File \"%s\", line %d in %s\n", filename, line, funcname);
-    } while ((frame = frame->f_back));
-  }
-}
-
 /** \} */
 
 /* -------------------------------------------------------------------- */
@@ -962,7 +948,7 @@ void PyC_RunQuicky(const char *filepath, int n, ...)
   FILE *fp = fopen(filepath, "r");
 
   if (fp) {
-    PyGILState_STATE gilstate = PyGILState_Ensure();
+    const PyGILState_STATE gilstate = PyGILState_Ensure();
 
     va_list vargs;
 
@@ -1437,7 +1423,7 @@ bool PyC_RunString_AsString(const char *imports[],
  */
 int PyC_Long_AsBool(PyObject *value)
 {
-  int test = _PyLong_AsInt(value);
+  const int test = _PyLong_AsInt(value);
   if (UNLIKELY((uint)test > 1)) {
     PyErr_SetString(PyExc_TypeError, "Python number not a bool (0/1)");
     return -1;
@@ -1447,7 +1433,7 @@ int PyC_Long_AsBool(PyObject *value)
 
 int8_t PyC_Long_AsI8(PyObject *value)
 {
-  int test = _PyLong_AsInt(value);
+  const int test = _PyLong_AsInt(value);
   if (UNLIKELY(test < INT8_MIN || test > INT8_MAX)) {
     PyErr_SetString(PyExc_OverflowError, "Python int too large to convert to C int8");
     return -1;
@@ -1457,7 +1443,7 @@ int8_t PyC_Long_AsI8(PyObject *value)
 
 int16_t PyC_Long_AsI16(PyObject *value)
 {
-  int test = _PyLong_AsInt(value);
+  const int test = _PyLong_AsInt(value);
   if (UNLIKELY(test < INT16_MIN || test > INT16_MAX)) {
     PyErr_SetString(PyExc_OverflowError, "Python int too large to convert to C int16");
     return -1;
@@ -1472,7 +1458,7 @@ int16_t PyC_Long_AsI16(PyObject *value)
 
 uint8_t PyC_Long_AsU8(PyObject *value)
 {
-  ulong test = PyLong_AsUnsignedLong(value);
+  const ulong test = PyLong_AsUnsignedLong(value);
   if (UNLIKELY(test > UINT8_MAX)) {
     PyErr_SetString(PyExc_OverflowError, "Python int too large to convert to C uint8");
     return (uint8_t)-1;
@@ -1482,7 +1468,7 @@ uint8_t PyC_Long_AsU8(PyObject *value)
 
 uint16_t PyC_Long_AsU16(PyObject *value)
 {
-  ulong test = PyLong_AsUnsignedLong(value);
+  const ulong test = PyLong_AsUnsignedLong(value);
   if (UNLIKELY(test > UINT16_MAX)) {
     PyErr_SetString(PyExc_OverflowError, "Python int too large to convert to C uint16");
     return (uint16_t)-1;
@@ -1492,7 +1478,7 @@ uint16_t PyC_Long_AsU16(PyObject *value)
 
 uint32_t PyC_Long_AsU32(PyObject *value)
 {
-  ulong test = PyLong_AsUnsignedLong(value);
+  const ulong test = PyLong_AsUnsignedLong(value);
   if (UNLIKELY(test > UINT32_MAX)) {
     PyErr_SetString(PyExc_OverflowError, "Python int too large to convert to C uint32");
     return (uint32_t)-1;