diff --git a/python/plugins/sextante/gdal/GdalUtils.py b/python/plugins/sextante/gdal/GdalUtils.py index dcb4260d1cb3..7aa3b13d747c 100644 --- a/python/plugins/sextante/gdal/GdalUtils.py +++ b/python/plugins/sextante/gdal/GdalUtils.py @@ -112,11 +112,11 @@ def getFormatShortNameFromFilename(filename): @staticmethod def escapeAndJoin(strList): - joined = QString() + joined = "" for s in strList: - if " " in s: - escaped = '"' + s.replace('\\', '\\\\').replace('"', '\\"') + '"' - else: - escaped = s - joined += escaped + " " - return joined.trimmed() + if " " in s: + escaped = '"' + s.replace('\\', '\\\\').replace('"', '\\"') + '"' + else: + escaped = s + joined += escaped + " " + return joined.strip() diff --git a/python/plugins/sextante/gdal/merge.py b/python/plugins/sextante/gdal/merge.py index 656ca4ba9ccc..3b3efffc8180 100644 --- a/python/plugins/sextante/gdal/merge.py +++ b/python/plugins/sextante/gdal/merge.py @@ -66,7 +66,7 @@ def processAlgorithm(self, progress): arguments.append(out) arguments.append("-of") arguments.append(GdalUtils.getFormatShortNameFromFilename(out)) - arguments.append(self.getParameterValue(merge.INPUT).replace(";", " ")) + arguments.extend(self.getParameterValue(merge.INPUT).split(";")) commands = [] if SextanteUtils.isWindows(): diff --git a/python/plugins/sextante/grass/ext/r_quantile.py b/python/plugins/sextante/grass/ext/r_quantile.py deleted file mode 100644 index 7b6b1b297ec1..000000000000 --- a/python/plugins/sextante/grass/ext/r_quantile.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -*************************************************************************** - r_quantile.py - --------------------- - Date : December 2012 - Copyright : (C) 2012 by Victor Olaya - Email : volayaf at gmail dot com -*************************************************************************** -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -*************************************************************************** -""" -__author__ = 'Victor Olaya' -__date__ = 'December 2012' -__copyright__ = '(C) 2012, Victor Olaya' -# This will get replaced with a git SHA1 when you do a git archive -__revision__ = '$Format:%H$' - -from sextante.grass.ext import HtmlReportPostProcessor - -def postProcessResults(alg): - HtmlReportPostProcessor.postProcessResults(alg) -