use normalize path (use native separators, avoid duplicate separators)

qgis · Dec 20, 2012 · e242af4 · e242af4
1 parent 8cb888c
commit e242af4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/python/plugins/sextante/modeler/ModelerUtils.py b/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):

diff --git a/python/plugins/sextante/r/RUtils.py b/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
-
-
diff --git a/python/plugins/sextante/script/ScriptUtils.py b/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)