From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Tue, 19 Oct 2010 10:42:01 +0000 (+0200)
Subject: * export PYTHONPATH to sfi.py
X-Git-Tag: sface-0.1-4~4^2~1
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=6a0d39ba688df2efbbf1d21d367200378f09f4a3;ds=sidebyside

* export PYTHONPATH to sfi.py
* insert mac specific paths to the front
---

diff --git a/sface-run b/sface-run
index eecabd2..5c121e6 100755
--- a/sface-run
+++ b/sface-run
@@ -5,7 +5,7 @@ import sys
 from optparse import OptionParser
 from PyQt4.QtGui import *
 
-sys.path.append(".")
+sys.path.insert(0, ".")
 exe = os.path.abspath(sys.argv[0])
 
 def using_env(e):
@@ -40,8 +40,8 @@ if sys.platform == "darwin":
     os.environ["PATH"] = PATH
     os.environ["DYLD_LIBRARY_PATH"] = DYLD_LIBRARY_PATH
     os.environ["DYLD_FRAMEWORK_PATH"] = DYLD_FRAMEWORK_PATH
-    if os.path.exists(RESOURCES):  sys.path.append(RESOURCES)
-    if os.path.exists(FRAMEWORKS): sys.path.append(FRAMEWORKS)
+    if os.path.exists(RESOURCES):  sys.path.insert(0, RESOURCES)
+    if os.path.exists(FRAMEWORKS): sys.path.insert(0, FRAMEWORKS)
 
 elif sys.platform == "linux2":
     sys.path.extend(["/usr/share", "/usr/share/sface"])
diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 8e5e371..a9ac769 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -20,7 +20,10 @@ class SfiProcess(QObject):
     def __init__(self, parent=None):
         QObject.__init__(self, parent)
 
+        env = QProcess.systemEnvironment()
+        env << "PYTHONPATH=%s" % ":".join(sys.path)
         self.process = QProcess()
+        self.process.setEnvironment(env)
         self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
                      self.processFinished)
         self.connect(self.process, SIGNAL("readyReadStandardOutput()"),