[Bf-blender-cvs] [9764d90fda6] master: Cleanup: use pyrna_enum_value_parse_string parser for enum args
Campbell Barton
noreply at git.blender.org
Fri Jul 30 08:17:17 CEST 2021
Commit: 9764d90fda685492c8fcb3bb55a8949749d461f2
Author: Campbell Barton
Date: Fri Jul 30 16:03:56 2021 +1000
Branches: master
https://developer.blender.org/rB9764d90fda685492c8fcb3bb55a8949749d461f2
Cleanup: use pyrna_enum_value_parse_string parser for enum args
===================================================================
M source/blender/python/intern/bpy_gizmo_wrap.c
M source/blender/python/intern/bpy_rna_callback.c
===================================================================
diff --git a/source/blender/python/intern/bpy_gizmo_wrap.c b/source/blender/python/intern/bpy_gizmo_wrap.c
index 34d2ba16e69..42e0c7d0003 100644
--- a/source/blender/python/intern/bpy_gizmo_wrap.c
+++ b/source/blender/python/intern/bpy_gizmo_wrap.c
@@ -54,20 +54,23 @@ static bool bpy_gizmotype_target_property_def(wmGizmoType *gzt, PyObject *item)
struct {
char *id;
- char *type_id;
- int type;
+ struct BPy_EnumProperty_Parse type_enum;
int array_length;
} params = {
.id = NULL, /* not optional */
- .type = PROP_FLOAT,
- .type_id = NULL,
+ .type_enum = {.items = rna_enum_property_type_items, .value = PROP_FLOAT},
.array_length = 1,
};
static const char *const _keywords[] = {"id", "type", "array_length", NULL};
- static _PyArg_Parser _parser = {"|$ssi:register_class", _keywords, 0};
- if (!_PyArg_ParseTupleAndKeywordsFast(
- empty_tuple, item, &_parser, ¶ms.id, ¶ms.type_id, ¶ms.array_length)) {
+ static _PyArg_Parser _parser = {"|$sO&i:register_class", _keywords, 0};
+ if (!_PyArg_ParseTupleAndKeywordsFast(empty_tuple,
+ item,
+ &_parser,
+ ¶ms.id,
+ pyrna_enum_value_parse_string,
+ ¶ms.type_enum,
+ ¶ms.array_length)) {
goto fail;
}
@@ -76,21 +79,12 @@ static bool bpy_gizmotype_target_property_def(wmGizmoType *gzt, PyObject *item)
goto fail;
}
- if ((params.type_id != NULL) &&
- pyrna_enum_value_from_id(
- rna_enum_property_type_items, params.type_id, ¶ms.type, "'type' enum value") == -1) {
- goto fail;
- }
- else {
- params.type = rna_enum_property_type_items[params.type].value;
- }
-
if ((params.array_length < 1 || params.array_length > RNA_MAX_ARRAY_LENGTH)) {
PyErr_SetString(PyExc_ValueError, "'array_length' out of range");
goto fail;
}
- WM_gizmotype_target_property_def(gzt, params.id, params.type, params.array_length);
+ WM_gizmotype_target_property_def(gzt, params.id, params.type_enum.value, params.array_length);
Py_DECREF(empty_tuple);
return true;
diff --git a/source/blender/python/intern/bpy_rna_callback.c b/source/blender/python/intern/bpy_rna_callback.c
index 7f8ea54ab98..adc0f425b52 100644
--- a/source/blender/python/intern/bpy_rna_callback.c
+++ b/source/blender/python/intern/bpy_rna_callback.c
@@ -288,76 +288,52 @@ PyObject *pyrna_callback_classmethod_add(PyObject *UNUSED(self), PyObject *args)
/* class specific callbacks */
if (srna == &RNA_WindowManager) {
- const char *error_prefix = "WindowManager.draw_cursor_add";
struct {
- const char *space_type_str;
- const char *region_type_str;
-
- int space_type;
- int region_type;
+ struct BPy_EnumProperty_Parse space_type_enum;
+ struct BPy_EnumProperty_Parse region_type_enum;
} params = {
- .space_type_str = NULL,
- .region_type_str = NULL,
- .space_type = SPACE_TYPE_ANY,
- .region_type = RGN_TYPE_ANY,
+ .space_type_enum = {.items = rna_enum_space_type_items, .value = SPACE_TYPE_ANY},
+ .region_type_enum = {.items = rna_enum_region_type_items, .value = RGN_TYPE_ANY},
};
if (!PyArg_ParseTuple(args,
- "OOO!|ss:WindowManager.draw_cursor_add",
+ "OOO!|O&O&:WindowManager.draw_cursor_add",
&cls,
&cb_func, /* already assigned, no matter */
&PyTuple_Type,
&cb_args,
- ¶ms.space_type_str,
- ¶ms.region_type_str)) {
- return NULL;
- }
-
- if (params.space_type_str && pyrna_enum_value_from_id(rna_enum_space_type_items,
- params.space_type_str,
- ¶ms.space_type,
- error_prefix) == -1) {
- return NULL;
- }
- if (params.region_type_str && pyrna_enum_value_from_id(rna_enum_region_type_items,
- params.region_type_str,
- ¶ms.region_type,
- error_prefix) == -1) {
+ pyrna_enum_value_parse_string,
+ ¶ms.space_type_enum,
+ pyrna_enum_value_parse_string,
+ ¶ms.region_type_enum)) {
return NULL;
}
- handle = WM_paint_cursor_activate(
- params.space_type, params.region_type, NULL, cb_wm_cursor_draw, (void *)args);
+ handle = WM_paint_cursor_activate(params.space_type_enum.value,
+ params.region_type_enum.value,
+ NULL,
+ cb_wm_cursor_draw,
+ (void *)args);
}
else if (RNA_struct_is_a(srna, &RNA_Space)) {
- const char *error_prefix = "Space.draw_handler_add";
struct {
- const char *region_type_str;
- const char *event_str;
-
- int region_type;
- int event;
- } params;
+ struct BPy_EnumProperty_Parse region_type_enum;
+ struct BPy_EnumProperty_Parse event_enum;
+ } params = {
+ .region_type_enum = {.items = rna_enum_region_type_items},
+ .event_enum = {.items = region_draw_mode_items},
+ };
if (!PyArg_ParseTuple(args,
- "OOO!ss:Space.draw_handler_add",
+ "OOO!O&O&:Space.draw_handler_add",
&cls,
&cb_func, /* already assigned, no matter */
&PyTuple_Type,
&cb_args,
- ¶ms.region_type_str,
- ¶ms.event_str)) {
- return NULL;
- }
-
- if (pyrna_enum_value_from_id(
- region_draw_mode_items, params.event_str, ¶ms.event, error_prefix) == -1) {
- return NULL;
- }
- if (pyrna_enum_value_from_id(rna_enum_region_type_items,
- params.region_type_str,
- ¶ms.region_type,
- error_prefix) == -1) {
+ pyrna_enum_value_parse_string,
+ ¶ms.region_type_enum,
+ pyrna_enum_value_parse_string,
+ ¶ms.event_enum)) {
return NULL;
}
@@ -368,12 +344,14 @@ PyObject *pyrna_callback_classmethod_add(PyObject *UNUSED(self), PyObject *args)
}
SpaceType *st = BKE_spacetype_from_id(spaceid);
- ARegionType *art = BKE_regiontype_from_id(st, params.region_type);
+ ARegionType *art = BKE_regiontype_from_id(st, params.region_type_enum.value);
if (art == NULL) {
- PyErr_Format(PyExc_TypeError, "region type '%.200s' not in space", params.region_type_str);
+ PyErr_Format(
+ PyExc_TypeError, "region type %R not in space", params.region_type_enum.value_orig);
return NULL;
}
- handle = ED_region_draw_cb_activate(art, cb_region_draw, (void *)args, params.event);
+ handle = ED_region_draw_cb_activate(
+ art, cb_region_draw, (void *)args, params.event_enum.value);
}
else {
PyErr_SetString(PyExc_TypeError, "callback_add(): type does not support callbacks");
@@ -430,37 +408,37 @@ PyObject *pyrna_callback_classmethod_remove(PyObject *UNUSED(self), PyObject *ar
else if (RNA_struct_is_a(srna, &RNA_Space)) {
const char *error_prefix = "Space.draw_handler_remove";
struct {
- const char *region_type_str;
-
- int region_type;
- } params;
+ struct BPy_EnumProperty_Parse region_type_enum;
+ } params = {
+ .region_type_enum = {.items = rna_enum_region_type_items},
+ };
if (!PyArg_ParseTuple(args,
- "OO!s:Space.draw_handler_remove",
+ "OO!O&:Space.draw_handler_remove",
&cls,
&PyCapsule_Type,
&py_handle, /* already assigned, no matter */
- ¶ms.region_type_str)) {
- return NULL;
- }
-
- if (pyrna_enum_value_from_id(rna_enum_region_type_items,
- params.region_type_str,
- ¶ms.region_type,
- error_prefix) == -1) {
+ pyrna_enum_value_parse_string,
+ ¶ms.region_type_enum)) {
return NULL;
}
const eSpace_Type spaceid = rna_Space_refine_reverse(srna);
if (spaceid == SPACE_EMPTY) {
- PyErr_Format(PyExc_TypeError, "unknown space type '%.200s'", RNA_struct_identifier(srna));
+ PyErr_Format(PyExc_TypeError,
+ "%s: unknown space type '%.200s'",
+ error_prefix,
+ RNA_struct_identifier(srna));
return NULL;
}
SpaceType *st = BKE_spacetype_from_id(spaceid);
- ARegionType *art = BKE_regiontype_from_id(st, params.region_type);
+ ARegionType *art = BKE_regiontype_from_id(st, params.region_type_enum.value);
if (art == NULL) {
- PyErr_Format(PyExc_TypeError, "region type '%.200s' not in space", params.region_type_str);
+ PyErr_Format(PyExc_TypeError,
+ "%s: region type %R not in space",
+ error_prefix,
+ params.region_type_enum.value_orig);
return NULL;
}
ED_region_draw_cb_exit(art, handle);
More information about the Bf-blender-cvs
mailing list