From e242af467339bef6b90b65ff3154f7dac243f018 Mon Sep 17 00:00:00 2001
From: Alexander Bruy <alexander.bruy@gmail.com>
Date: Thu, 20 Dec 2012 10:44:11 +0200
Subject: [PATCH] use normalize path (use native separators, avoid duplicate
 separators)

---
 python/plugins/sextante/modeler/ModelerUtils.py |  4 ++--
 python/plugins/sextante/r/RUtils.py             | 15 ++++-----------
 python/plugins/sextante/script/ScriptUtils.py   |  4 ++--
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/python/plugins/sextante/modeler/ModelerUtils.py b/python/plugins/sextante/modeler/ModelerUtils.py
index 3902b812d07d..6418194bc489 100644
--- 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
index 38bad582f28f..4178969dc1ec 100644
--- 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
index afdf3cd5e5a9..3c6893f616e3 100644
--- 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)