From ce50b6562b83c868eadab993892200ac3dd84638 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 12 Jun 2012 13:18:39 -0500 Subject: Remove guidance-specific EXTRA_MODULE_DIR code from this generic module This resolves Bug 999 --- src/kdedistutils.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/kdedistutils.py b/src/kdedistutils.py index 9557dc4..b8b3743 100644 --- a/src/kdedistutils.py +++ b/src/kdedistutils.py @@ -872,9 +872,6 @@ class BuildKControlModule(Command): #include #define MODULE_DIR "%(moduledir)s" -#define EXTRA_MODULE_DIR "/opt/trinity/share/python-support/tde-guidance-trinity" -#define EXTRA_MODULE_DIR_TWO "/opt/trinity/share/python-support/guidance-backends-trinity" -#define EXTRA_MODULE_DIR_THREE "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity" #define MODULE_NAME "%(modulename)s" #define FACTORY "%(factoryfunction)s" #define CPP_FACTORY %(factoryfunction)s @@ -915,18 +912,6 @@ static KCModule* return_instance( QWidget *parent, const char *name ) { if(!pyize->appendToSysPath (path.latin1 ())) { return report_error ("***Failed to set sys.path\n"); } - QString extrapath = QString(EXTRA_MODULE_DIR); - if(!pyize->appendToSysPath (extrapath.latin1 ())) { - return report_error ("***Failed to set extra sys.path\n"); - } - QString extrapath_two = QString(EXTRA_MODULE_DIR_TWO); - if(!pyize->appendToSysPath (extrapath_two.latin1 ())) { - return report_error ("***Failed to set extra 2 sys.path\n"); - } - QString extrapath_three = QString(EXTRA_MODULE_DIR_THREE); - if(!pyize->appendToSysPath (extrapath_three.latin1 ())) { - return report_error ("***Failed to set extra 3 sys.path\n"); - } // Load the Python script. PyObject *pyModule = pyize->importModule ((char *)script.latin1 ()); -- cgit v1.2.1