use system-wide temp directory for temporary files instead of own dir in

alexbruy · alexbruy · commit 8cb888c00729 · 2012-12-20T10:42:44.000+02:00
user profile
diff --git a/python/plugins/sextante/SextantePlugin.py b/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():
diff --git a/python/plugins/sextante/core/SextanteUtils.py b/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):
