disable error hooks when querying for plugin metadata

wonder · wonder · commit 22dfe17c6226 · 2008-11-17T15:30:48.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@9651 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
@@ -147,6 +147,11 @@ void QgsPythonUtilsImpl::installErrorHook()
   runString( "sys.excepthook = qgis_except_hook" );
 }
 
+void QgsPythonUtilsImpl::uninstallErrorHook()
+{
+  runString( "sys.excepthook = sys.__excepthook__" );
+}
+
 void QgsPythonUtilsImpl::installConsoleHooks()
 {
   runString( "sys.displayhook = console_display_hook\n" );
@@ -419,12 +424,15 @@ QString QgsPythonUtilsImpl::getPluginMetadata( QString pluginName, QString funct
   QString command = pluginName + "." + function + "()";
   QString retval = "???";
 
+  // temporary disable error hook - UI will handle this gracefully
+  uninstallErrorHook();
   PyObject* obj = PyRun_String( command.toLocal8Bit().data(), Py_eval_input, mMainDict, mMainDict );
+  
   if ( PyErr_Occurred() )
   {
     PyErr_Print(); // just print it to console
     PyErr_Clear();
-    return "__error__";
+    retval = "__error__";
   }
   else if ( PyString_Check( obj ) )
   {
@@ -436,6 +444,8 @@ QString QgsPythonUtilsImpl::getPluginMetadata( QString pluginName, QString funct
     retval = "__error__";
   }
   Py_XDECREF( obj );
+  
+  installErrorHook();
   return retval;
 }
 
diff --git a/src/python/qgspythonutilsimpl.h b/src/python/qgspythonutilsimpl.h
@@ -112,6 +112,8 @@ class QgsPythonUtilsImpl : public QgsPythonUtils
 
     void installErrorHook();
 
+    void uninstallErrorHook();
+    
     QString getTraceback();
 
     //! reference to module __main__

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,11 @@ void QgsPythonUtilsImpl::installErrorHook()`
`147`	`147`	`runString( "sys.excepthook = qgis_except_hook" );`
`148`	`148`	`}`
`149`	`149`
	`150`	`+void QgsPythonUtilsImpl::uninstallErrorHook()`
	`151`	`+{`
	`152`	`+ runString( "sys.excepthook = sys.__excepthook__" );`
	`153`	`+}`
	`154`	`+`
`150`	`155`	`void QgsPythonUtilsImpl::installConsoleHooks()`
`151`	`156`	`{`
`152`	`157`	`runString( "sys.displayhook = console_display_hook\n" );`
`@@ -419,12 +424,15 @@ QString QgsPythonUtilsImpl::getPluginMetadata( QString pluginName, QString funct`
`419`	`424`	`QString command = pluginName + "." + function + "()";`
`420`	`425`	`QString retval = "???";`
`421`	`426`
	`427`	`+ // temporary disable error hook - UI will handle this gracefully`
	`428`	`+ uninstallErrorHook();`
`422`	`429`	`PyObject* obj = PyRun_String( command.toLocal8Bit().data(), Py_eval_input, mMainDict, mMainDict );`
	`430`	`+`
`423`	`431`	`if ( PyErr_Occurred() )`
`424`	`432`	`{`
`425`	`433`	`PyErr_Print(); // just print it to console`
`426`	`434`	`PyErr_Clear();`
`427`		`- return "__error__";`
	`435`	`+ retval = "__error__";`
`428`	`436`	`}`
`429`	`437`	`else if ( PyString_Check( obj ) )`
`430`	`438`	`{`
`@@ -436,6 +444,8 @@ QString QgsPythonUtilsImpl::getPluginMetadata( QString pluginName, QString funct`
`436`	`444`	`retval = "__error__";`
`437`	`445`	`}`
`438`	`446`	`Py_XDECREF( obj );`
	`447`	`+`
	`448`	`+ installErrorHook();`
`439`	`449`	`return retval;`
`440`	`450`	`}`
`441`	`451`