[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35533] trunk/blender/source/blender/ python/intern/bpy_rna.c: fix [#26489] Auto completion in console broken

[Campbell Barton]

Revision: 35533
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35533
Author:   campbellbarton
Date:     2011-03-14 05:39:07 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
fix [#26489] Auto completion in console broken
own mistake in r35492.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35492

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-14 05:03:53 UTC (rev 35532)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2011-03-14 05:39:07 UTC (rev 35533)
@@ -3141,13 +3141,16 @@
 		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;
 
-			if(RNA_property_collection_type_get(&self->ptr, self->prop, &r_ptr)) {
-				PyObject *cls= pyrna_struct_Subtype(&r_ptr); /* borrows */
+				PyObject *error_type, *error_value, *error_traceback;
+				PyErr_Fetch(&error_type, &error_value, &error_traceback);
+				PyErr_Clear();
+
+				cls= pyrna_struct_Subtype(&r_ptr); /* borrows */
 				ret= PyObject_GenericGetAttr(cls, pyname);
+				/* restore the original error */
 				if(ret == NULL) {
 					PyErr_Restore(error_type, error_value, error_traceback);
 				}