Attachment #1166 for bug #1188

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1188
Collapse All | Expand All

Lines 712-717 Link Here

(-)pykdeextensions-3.5.13.1/src/kdedistutils.py.extramodule (+4 lines)
712		712
713	# Build the 'stub' code.	713	# Build the 'stub' code.
714	cppcode = self.cpptemplate % {"moduledir": self.data_dir,	714	cppcode = self.cpptemplate % {"moduledir": self.data_dir,
		715	"extramodule": os.getenv("EXTRA_MODULE_DIR"),
		716	"pyqt_dir": self.pyqt_dir,
715	"modulename": modulename,	717	"modulename": modulename,
716	"factoryfunction": factoryfunction,	718	"factoryfunction": factoryfunction,
717	"python_version": python_version}	719	"python_version": python_version}
Lines 854-859 Link Here
854	#include <sip.h>	856	#include <sip.h>
855		857
856	#define MODULE_DIR "%(moduledir)s"	858	#define MODULE_DIR "%(moduledir)s"
		859	#define EXTRA_MODULE_DIR "%(extramodule)s"
		860	#define PYQT_DIR "%(pyqt_dir)s"
857	#define MODULE_NAME "%(modulename)s"	861	#define MODULE_NAME "%(modulename)s"
858	#define FACTORY "%(factoryfunction)s"	862	#define FACTORY "%(factoryfunction)s"
859	#define CPP_FACTORY %(factoryfunction)s	863	#define CPP_FACTORY %(factoryfunction)s




    if(!pyize->appendToSysPath (path.latin1 ())) {
        return report_error ("***Failed to set sys.path\n");
    }

    // Add the extra path to the python script to the interpreter search path.
    QString extrapath = QString(EXTRA_MODULE_DIR);
    if(!pyize->appendToSysPath (extrapath.latin1 ())) {
      return report_error ("***Failed to set extra sys.path\n");
    }

    // Add the PYQT path to the python script to the interpreter search path.
    QString pyqt_dir = QString(PYQT_DIR);
    if(!pyize->appendToSysPath (pyqt_dir.latin1 ())) {
      return report_error ("***Failed to set PYQT sys.path\n");
    }
    
    // Load the Python script.
    PyObject *pyModule = pyize->importModule ((char *)script.latin1 ());

Return to bug 1188

Lines 903-908 Link Here

(-)pykdeextensions-3.5.13.1/src/kdedistutils.py.ORI (+12 lines)
903	if(!pyize->appendToSysPath (path.latin1 ())) {	906	if(!pyize->appendToSysPath (path.latin1 ())) {
904	return report_error ("***Failed to set sys.path\n");	907	return report_error ("***Failed to set sys.path\n");
905	}	908	}
		909
		910	// Add the extra path to the python script to the interpreter search path.
		911	QString extrapath = QString(EXTRA_MODULE_DIR);
		912	if(!pyize->appendToSysPath (extrapath.latin1 ())) {
		913	return report_error ("***Failed to set extra sys.path\n");
		914	}
		915
		916	// Add the PYQT path to the python script to the interpreter search path.
		917	QString pyqt_dir = QString(PYQT_DIR);
		918	if(!pyize->appendToSysPath (pyqt_dir.latin1 ())) {
		919	return report_error ("***Failed to set PYQT sys.path\n");
		920	}
906		921
907	// Load the Python script.	922	// Load the Python script.
908	PyObject pyModule = pyize->importModule ((char )script.latin1 ());	923	PyObject pyModule = pyize->importModule ((char )script.latin1 ());