sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Run startup.py only once

Browse Source 
Fix #15189
This commit is contained in:
Matthias Kuhn 2016-07-02 17:15:31 +02:00
parent 459fa8c0c5
commit f54d845d41
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/python/qgspythonutilsimpl.cpp
View File

@ -209,13 +209,6 @@ bool QgsPythonUtilsImpl::checkQgisUser()
return true;
}
void QgsPythonUtilsImpl::doUserImports()
{
QString startuppath = homePythonPath() + " + \"/startup.py\"";
runString( "if os.path.exists(" + startuppath + "): from startup import *\n" );
}
void QgsPythonUtilsImpl::initPython( QgisInterface* interface )
{
init();
@ -231,7 +224,6 @@ void QgsPythonUtilsImpl::initPython( QgisInterface* interface )
exitPython();
return;
}
doUserImports();
finish();
}
@ -257,7 +249,6 @@ void QgsPythonUtilsImpl::initServerPython( QgsServerInterface* interface )
// This is the other main difference with initInterface() for desktop plugins
runString( "qgis.utils.initServerInterface(" + QString::number(( unsigned long ) interface ) + ')' );
doUserImports();
finish();
}

3
src/python/qgspythonutilsimpl.h
View File

@ -126,9 +126,6 @@ class QgsPythonUtilsImpl : public QgsPythonUtils
//@return true if qgis.user could be imported
bool checkQgisUser();
//! import user defined Python code
void doUserImports();
//! cleanup Python context
void finish();