[Bf-blender-cvs] [1db47a2ccd1] master: Fix PyRNA class registration w/ Python 3.7

Campbell Barton noreply at git.blender.org
Thu Jul 12 08:31:09 CEST 2018


Commit: 1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f
Author: Campbell Barton
Date:   Thu Jul 12 08:28:06 2018 +0200
Branches: master
https://developer.blender.org/rB1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f

Fix PyRNA class registration w/ Python 3.7

In Python3.7 this now raises an error.

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

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

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

diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 9052b6f580a..80b0aa7a51b 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -7577,10 +7577,12 @@ static int bpy_class_validate_recursive(PointerRNA *dummyptr, StructRNA *srna, v
 		if (!(flag & PROP_REGISTER))
 			continue;
 
+		/* TODO(campbell): Use Python3.7x _PyObject_LookupAttr(), also in the macro below. */
 		identifier = RNA_property_identifier(prop);
 		item = PyObject_GetAttrString(py_class, identifier);
 
 		if (item == NULL) {
+			PyErr_Clear();
 			/* Sneaky workaround to use the class name as the bl_idname */
 
 #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);                                          \
 				}                                                             \
+				else {                                                        \
+					PyErr_Clear();                                            \
+				}                                                             \
 			}  /* intentionally allow else here */
 
 			if (false) {}  /* needed for macro */



More information about the Bf-blender-cvs mailing list