[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39701] trunk/blender: executing operators that changed the context from the console wasnt returning an operator set /flag.

[Campbell Barton]

Revision: 39701
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39701
Author:   campbellbarton
Date:     2011-08-25 17:59:37 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
executing operators that changed the context from the console wasnt returning an operator set/flag.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/console_python.py
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/release/scripts/modules/console_python.py
===================================================================
--- trunk/blender/release/scripts/modules/console_python.py	2011-08-25 17:54:30 UTC (rev 39700)
+++ trunk/blender/release/scripts/modules/console_python.py	2011-08-25 17:59:37 UTC (rev 39701)
@@ -179,7 +179,7 @@
 
     # special exception. its possible the command loaded a new user interface
     if hash(sc) != hash(context.space_data):
-        return
+        return {'FINISHED'}
 
     bpy.ops.console.scrollback_append(text=sc.prompt + line, type='INPUT')
 

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2011-08-25 17:54:30 UTC (rev 39700)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2011-08-25 17:59:37 UTC (rev 39701)
@@ -6428,7 +6428,7 @@
 				PyErr_Fetch(&error_type, &error_value, &error_traceback);
 
 				PyErr_Format(error_type,
-				             "expected class %.200s, function %.200s: incompatible return value%S",
+				             "class %.200s, function %.200s: incompatible return value%S",
 				             RNA_struct_identifier(ptr->type), RNA_function_identifier(func),
 				             error_value);
 			}