python/plugins/sextante/SextantePlugin.py

@@ -110,13 +110,14 @@ def unload(self):
         self.menu.deleteLater()
         #delete temporary output files
         folder = SextanteUtils.tempFolder()
-        for f in os.listdir(folder):
-            path = os.path.join(folder,f)
-            try:
-                os.unlink(path)
-            except:
-                #leave files that could not be deleted
-                pass
+        if QDir(folder).exists():
+            for f in os.listdir(folder):
+                path = os.path.join(folder, f)
+                try:
+                    os.unlink(path)
+                except:
+                    #leave files that could not be deleted
+                    pass
 
     def openToolbox(self):
         if self.toolbox.isVisible():

python/plugins/sextante/core/SextanteUtils.py

@@ -40,7 +40,7 @@ def userFolder():
         if not QDir(userDir).exists():
             QDir().mkpath(userDir)
 
-        return unicode(userDir)
+        return unicode(QDir.toNativeSeparators(userDir))
 
     @staticmethod
     def isWindows():
@@ -52,11 +52,11 @@ def isMac():
 
     @staticmethod
     def tempFolder():
-        tempDir = QFileInfo(QgsApplication.qgisUserDbFilePath()).path() + "/sextante/tempdata"
+        tempDir = os.path.join(unicode(QDir.tempPath()), "sextante")
         if not QDir(tempDir).exists():
             QDir().mkpath(tempDir)
 
-        return unicode(tempDir)
+        return unicode(os.path.abspath(tempDir))
 
     @staticmethod
     def setTempOutput(out, alg):

python/plugins/sextante/modeler/ModelerUtils.py

@@ -36,10 +36,10 @@ class ModelerUtils:
     def modelsFolder():
         folder = SextanteConfig.getSetting(ModelerUtils.MODELS_FOLDER)
         if folder == None:
-            folder = SextanteUtils.userFolder() + os.sep + "models"
+            folder = unicode(os.path.join(SextanteUtils.userFolder(), "models"))
         mkdir(folder)
 
-        return folder
+        return os.path.abspath(folder)
 
     @staticmethod
     def getAlgorithm(name):

python/plugins/sextante/r/RUtils.py

@@ -40,19 +40,18 @@ class RUtils:
     def RFolder():
         folder = SextanteConfig.getSetting(RUtils.R_FOLDER)
         if folder == None:
-            folder =""
+            folder = ""
 
-        return folder
+        return os.path.abspath(unicode(folder))
 
     @staticmethod
     def RScriptsFolder():
         folder = SextanteConfig.getSetting(RUtils.RSCRIPTS_FOLDER)
         if folder == None:
-            #folder = os.path.join(os.path.dirname(__file__), "scripts")
-            folder = SextanteUtils.userFolder() + os.sep + "rscripts"
+            folder = unicode(os.path.join(SextanteUtils.userFolder(), "rscripts"))
         mkdir(folder)
 
-        return folder
+        return os.path.abspath(folder)
 
     @staticmethod
     def createRScriptFromRCommands(commands):
@@ -61,17 +60,14 @@ def createRScriptFromRCommands(commands):
             scriptfile.write(command + "\n")
         scriptfile.close()
 
-
     @staticmethod
     def getRScriptFilename():
         return SextanteUtils.userFolder() + os.sep + "sextante_script.r"
 
-
     @staticmethod
     def getConsoleOutputFilename():
         return RUtils.getRScriptFilename()+".Rout"
 
-
     @staticmethod
     def executeRAlgorithm(alg, progress):
         RUtils.verboseCommands = alg.getVerboseCommands();
@@ -113,7 +109,6 @@ def createConsoleOutput():
                     RUtils.consoleResults.append("<p>" + line + "</p>\n");
                 RUtils.allConsoleResults.append(line);
 
-
     @staticmethod
     def getConsoleOutput():
         s = "<font face=\"courier\">\n"
@@ -123,5 +118,3 @@ def getConsoleOutput():
         s+="</font>\n"
 
         return s
-
-

python/plugins/sextante/script/ScriptUtils.py

@@ -37,7 +37,7 @@ class ScriptUtils:
     def scriptsFolder():
         folder = SextanteConfig.getSetting(ScriptUtils.SCRIPTS_FOLDER)
         if folder == None:
-            folder = SextanteUtils.userFolder() + os.sep + "scripts"
+            folder = unicode(os.path.join(SextanteUtils.userFolder(), "scripts"))
         mkdir(folder)
 
-        return folder
+        return os.path.abspath(folder)