Python: remove redundant casts

4 files changed, 25 insertions, 21 deletions

diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c
index 96b5707ec27..36ae30ada22 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -419,7 +419,7 @@ PyObject *PyC_ExceptionBuffer(void)
 	if (!(string_io_mod = PyImport_ImportModule("io"))) {
 		goto error_cleanup;
 	}
-	else if (!(string_io = PyObject_CallMethod(string_io_mod, (char *)"StringIO", NULL))) {
+	else if (!(string_io = PyObject_CallMethod(string_io_mod, "StringIO", NULL))) {
 		goto error_cleanup;
 	}
 	else if (!(string_io_getvalue = PyObject_GetAttrString(string_io, "getvalue"))) {
@@ -651,12 +651,12 @@ void PyC_RunQuicky(const char *filepath, int n, ...)
 			const char *format = va_arg(vargs, char *);
 			void *ptr = va_arg(vargs, void *);
 
-			ret = PyObject_CallFunction(calcsize, (char *)"s", format);
+			ret = PyObject_CallFunction(calcsize, "s", format);
 
 			if (ret) {
 				sizes[i] = PyLong_AsLong(ret);
 				Py_DECREF(ret);
-				ret = PyObject_CallFunction(unpack, (char *)"sy#", format, (char *)ptr, sizes[i]);
+				ret = PyObject_CallFunction(unpack, "sy#", format, (char *)ptr, sizes[i]);
 			}
 
 			if (ret == NULL) {
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index b7752b39900..ddfbfecc46e 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -212,25 +212,29 @@ static PyObject *CCL_initPython(void)
 #endif
 
 static struct _inittab bpy_internal_modules[] = {
-	{(char *)"mathutils", PyInit_mathutils},
-//	{(char *)"mathutils.geometry", PyInit_mathutils_geometry},
-//	{(char *)"mathutils.noise", PyInit_mathutils_noise},
-//	{(char *)"mathutils.kdtree", PyInit_mathutils_kdtree},
-	{(char *)"_bpy_path", BPyInit__bpy_path},
-	{(char *)"bgl", BPyInit_bgl},
-	{(char *)"blf", BPyInit_blf},
-	{(char *)"bmesh", BPyInit_bmesh},
-	// {(char *)"bmesh.types", BPyInit_bmesh_types},
-	// {(char *)"bmesh.utils", BPyInit_bmesh_utils},
-	// {(char *)"bmesh.utils", BPyInit_bmesh_geometry},
+	{"mathutils", PyInit_mathutils},
+#if 0
+	{"mathutils.geometry", PyInit_mathutils_geometry},
+	{"mathutils.noise", PyInit_mathutils_noise},
+	{"mathutils.kdtree", PyInit_mathutils_kdtree},
+#endif
+	{"_bpy_path", BPyInit__bpy_path},
+	{"bgl", BPyInit_bgl},
+	{"blf", BPyInit_blf},
+	{"bmesh", BPyInit_bmesh},
+#if 0
+	{"bmesh.types", BPyInit_bmesh_types},
+	{"bmesh.utils", BPyInit_bmesh_utils},
+	{"bmesh.utils", BPyInit_bmesh_geometry},
+#endif
 #ifdef WITH_AUDASPACE
-	{(char *)"aud", AUD_initPython},
+	{"aud", AUD_initPython},
 #endif
 #ifdef WITH_CYCLES
-	{(char *)"_cycles", CCL_initPython},
+	{"_cycles", CCL_initPython},
 #endif
-	{(char *)"gpu", GPU_initPython},
-	{(char *)"idprop", BPyInit_idprop},
+	{"gpu", GPU_initPython},
+	{"idprop", BPyInit_idprop},
 	{NULL, NULL}
 };
 
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 38a0f74f009..440af035bcd 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -6255,7 +6255,7 @@ static PyObject *pyrna_srna_Subtype(StructRNA *srna)
 
 		/* always use O not N when calling, N causes refcount errors */
 #if 0
-		newclass = PyObject_CallFunction(metaclass, (char *)"s(O) {sss()}",
+		newclass = PyObject_CallFunction(metaclass, "s(O) {sss()}",
 		                                 idname, py_base, "__module__", "bpy.types", "__slots__");
 #else
 		{
diff --git a/source/blender/python/mathutils/mathutils_kdtree.c b/source/blender/python/mathutils/mathutils_kdtree.c
index 0833d522a60..519778aea7d 100644
--- a/source/blender/python/mathutils/mathutils_kdtree.c
+++ b/source/blender/python/mathutils/mathutils_kdtree.c
@@ -102,7 +102,7 @@ static int PyKDTree__tp_init(PyKDTree *self, PyObject *args, PyObject *kwargs)
 	unsigned int maxsize;
 	const char *keywords[] = {"size", NULL};
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *)"I:KDTree", (char **)keywords, &maxsize)) {
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "I:KDTree", (char **)keywords, &maxsize)) {
 		return -1;
 	}
 
@@ -425,7 +425,7 @@ PyMODINIT_FUNC PyInit_mathutils_kdtree(void)
 	if (PyType_Ready(&PyKDTree_Type)) {
 		return NULL;
 	}
-	PyModule_AddObject(m, (char *)"KDTree", (PyObject *) &PyKDTree_Type);
+	PyModule_AddObject(m, "KDTree", (PyObject *) &PyKDTree_Type);
 
 	return m;
 }