sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

disable error hooks when querying for plugin metadata

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@9651 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
wonder 2008-11-17 15:30:48 +00:00
parent edd6c414f0
commit 22dfe17c62
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/python/qgspythonutilsimpl.cpp
View File

@ -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;
}

2
src/python/qgspythonutilsimpl.h
View File

@ -112,6 +112,8 @@ class QgsPythonUtilsImpl : public QgsPythonUtils
void installErrorHook();
void uninstallErrorHook();
QString getTraceback();
//! reference to module __main__