[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35492] trunk/blender/source/blender/ python/intern/bpy_rna.c: py/rna, ability to have python static methods in collections.

[Campbell Barton]

Revision: 35492
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35492
Author:   campbellbarton
Date:     2011-03-12 14:32:30 +0000 (Sat, 12 Mar 2011)
Log Message:
-----------
py/rna, ability to have python static methods in collections.

Modified Paths:
--------------
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c        2011-03-12 
14:21:04 UTC (rev 35491)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c        2011-03-12 
14:32:30 UTC (rev 35492)
@@ -76,6 +76,7 @@
 #define USE_MATHUTILS
 #define USE_STRING_COERCE
 
+static PyObject* pyrna_struct_Subtype(PointerRNA *ptr);
 static PyObject *pyrna_prop_collection_values(BPy_PropertyRNA *self);
 
 int pyrna_struct_validity_check(BPy_StructRNA *pysrna)
@@ -3126,8 +3127,36 @@
                }
        }
 
-       /* The error raised here will be displayed */
+#if 0
        return PyObject_GenericGetAttr((PyObject *)self, pyname);
+#else
+       {
+               /* Could just do this except for 1 awkward case.
+                * PyObject_GenericGetAttr((PyObject *)self, pyname);
+                * so as to support 'bpy.data.library.load()'
+                * note, this _only_ supports static methods */
+
+               PyObject *ret= PyObject_GenericGetAttr((PyObject *)self, 
pyname);
+
+               if(ret == NULL) {
+                       /* since this is least common case, handle it last */
+                       PointerRNA r_ptr;
+                       PyObject *error_type, *error_value, *error_traceback;
+                       PyErr_Fetch(&error_type, &error_value, 
&error_traceback);
+                       PyErr_Clear();
+
+                       if(RNA_property_collection_type_get(&self->ptr, 
self->prop, &r_ptr)) {
+                               PyObject *cls= pyrna_struct_Subtype(&r_ptr); /* 
borrows */
+                               ret= PyObject_GenericGetAttr(cls, pyname);
+                               if(ret == NULL) {
+                                       PyErr_Restore(error_type, error_value, 
error_traceback);
+                               }
+                       }
+               }
+
+               return ret;
+       }
+#endif
 }
 
 //--------------- setattr-------------------------------------------

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs