[Bf-blender-cvs] [a0ef147f29c] master: bpy consistency fix handler_add(handle)

Dalai Felinto noreply at git.blender.org
Tue Apr 17 12:47:21 CEST 2018


Commit: a0ef147f29cf2b067fb27b15a1c634d253668e77
Author: Dalai Felinto
Date:   Tue Apr 17 12:29:24 2018 +0200
Branches: master
https://developer.blender.org/rBa0ef147f29cf2b067fb27b15a1c634d253668e77

bpy consistency fix handler_add(handle)

This doesn't change the API, so it doesn't affect any script.
However it give more consistent error messages.

===================================================================

M	source/blender/python/intern/bpy_rna_callback.c

===================================================================

diff --git a/source/blender/python/intern/bpy_rna_callback.c b/source/blender/python/intern/bpy_rna_callback.c
index 68783feacd9..01a25137a98 100644
--- a/source/blender/python/intern/bpy_rna_callback.c
+++ b/source/blender/python/intern/bpy_rna_callback.c
@@ -189,7 +189,7 @@ PyObject *pyrna_callback_classmethod_add(PyObject *UNUSED(self), PyObject *args)
 	StructRNA *srna;
 
 	if (PyTuple_GET_SIZE(args) < 2) {
-		PyErr_SetString(PyExc_ValueError, "handler_add(handle): expected at least 2 args");
+		PyErr_SetString(PyExc_ValueError, "handler_add(handler): expected at least 2 args");
 		return NULL;
 	}
 
@@ -252,7 +252,7 @@ PyObject *pyrna_callback_classmethod_remove(PyObject *UNUSED(self), PyObject *ar
 	int cb_regiontype;
 
 	if (PyTuple_GET_SIZE(args) < 2) {
-		PyErr_SetString(PyExc_ValueError, "callback_remove(handle): expected at least 2 args");
+		PyErr_SetString(PyExc_ValueError, "callback_remove(handler): expected at least 2 args");
 		return NULL;
 	}
 
@@ -263,7 +263,7 @@ PyObject *pyrna_callback_classmethod_remove(PyObject *UNUSED(self), PyObject *ar
 	py_handle = PyTuple_GET_ITEM(args, 1);
 	handle = PyCapsule_GetPointer(py_handle, RNA_CAPSULE_ID);
 	if (handle == NULL) {
-		PyErr_SetString(PyExc_ValueError, "callback_remove(handle): NULL handle given, invalid or already removed");
+		PyErr_SetString(PyExc_ValueError, "callback_remove(handler): NULL handler given, invalid or already removed");
 		return NULL;
 	}



More information about the Bf-blender-cvs mailing list