Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix PyRNA class registration w/ Python 3.7

Browse Source 
In Python3.7 this now raises an error.
This commit is contained in:
Campbell Barton
2018-07-12 08:28:06 +02:00
parent b843753ad5
commit 1db47a2ccd
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/python/intern/bpy_rna.c
View File

@@ -7577,10 +7577,12 @@ static int bpy_class_validate_recursive(PointerRNA *dummyptr, StructRNA *srna, v
if (!(flag & PROP_REGISTER)) if (!(flag & PROP_REGISTER))
continue; continue;
/* TODO(campbell): Use Python3.7x _PyObject_LookupAttr(), also in the macro below. */
identifier = RNA_property_identifier(prop); identifier = RNA_property_identifier(prop);
item = PyObject_GetAttrString(py_class, identifier); item = PyObject_GetAttrString(py_class, identifier);
if (item == NULL) { if (item == NULL) {
PyErr_Clear();
/* Sneaky workaround to use the class name as the bl_idname */ /* Sneaky workaround to use the class name as the bl_idname */
#define BPY_REPLACEMENT_STRING(rna_attr, py_attr) \ #define BPY_REPLACEMENT_STRING(rna_attr, py_attr) \
@@ -7596,6 +7598,9 @@ static int bpy_class_validate_recursive(PointerRNA *dummyptr, StructRNA *srna, v
} \ } \
Py_DECREF(item); \ Py_DECREF(item); \
} \ } \
else { \
PyErr_Clear(); \
} \
} /* intentionally allow else here */ } /* intentionally allow else here */
if (false) {} /* needed for macro */ if (false) {} /* needed for macro */