Skip to content

Commit 4987f4a

Browse files
volayavolaya
committedSep 14, 2013
Revert "[processing]fixed bug with wrong characters in output filenames" (caused circular import)
This reverts commit ff5e1ee.
·
ltr-3_40archive/master_2
1 parent d8b8089 commit 4987f4a

File tree

8 files changed

+16
-17
lines changed

8 files changed

+16
-17
lines changed
 

‎python/plugins/processing/core/GeoAlgorithm.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
* *
1717
***************************************************************************
1818
"""
19-
from processing import interface
2019
__author__ = 'Victor Olaya'
2120
__date__ = 'August 2012'
2221
__copyright__ = '(C) 2012, Victor Olaya'
@@ -284,7 +283,7 @@ def setOutputCRS(self):
284283
if p is not None:
285284
self.crs = p.crs()
286285
return
287-
qgis = interface.iface
286+
qgis = dataobjects.iface
288287
self.crs = qgis.mapCanvas().mapRenderer().destinationCrs()
289288

290289
def checkInputCRS(self):
@@ -369,9 +368,11 @@ def __str__(self):
369368

370369
def commandLineName(self):
371370
name = self.provider.getName().lower() + ":" + self.name.lower()
372-
name = removeInvalidChars(name)
371+
validChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:"
372+
name = ''.join(c for c in name if c in validChars)
373373
return name
374374

375+
375376
def removeOutputFromName(self, name):
376377
for out in self.outputs:
377378
if out.name == name:

‎python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
* *
1717
***************************************************************************
1818
"""
19-
from processing.tools.general import removeInvalidChars
2019

2120

2221
__author__ = 'Victor Olaya'
@@ -229,7 +228,8 @@ def okPressed(self):
229228
QMessageBox.critical(self, "Unable to define parameter", "Invalid parameter name")
230229
return
231230
if self.param is None:
232-
safeName = removeInvalidChars(description)
231+
validChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
232+
safeName = ''.join(c for c in description if c in validChars)
233233
name = self.paramType.upper().replace(" ","") + "_" + safeName.upper()
234234
else:
235235
name = self.param.name

‎python/plugins/processing/saga/SagaAlgorithm.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,8 @@ def exportRasterLayer(self, source):
384384
filename = str(layer.name())
385385
else:
386386
filename = os.path.basename(source)
387-
filename = removeInvalidChars(filename)
387+
validChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:"
388+
filename = ''.join(c for c in filename if c in validChars)
388389
if len(filename) == 0:
389390
filename = "layer"
390391
destFilename = getTempFilenameInTempFolder(filename + ".sgrd")

‎python/plugins/processing/saga/SplitRGBBands.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ def processAlgorithm(self, progress):
5555
input = self.getParameterValue(SplitRGBBands.INPUT)
5656
temp = getTempFilename(None).replace('.','');
5757
basename = os.path.basename(temp)
58-
safeBasename = removeInvalidChars(basename)
58+
validChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
59+
safeBasename = ''.join(c for c in basename if c in validChars)
5960
temp = os.path.join(os.path.dirname(temp), safeBasename)
6061

6162
r = self.getOutputValue(SplitRGBBands.R)

‎python/plugins/processing/tools/dataobjects.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,10 @@ def exportVectorLayer(layer):
219219
filename = filename[:idx]
220220

221221
filename = str(layer.name())
222-
filename = removeInvalidChars(filename)
222+
validChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:"
223+
filename = ''.join(c for c in filename if c in validChars)
223224
if len(filename) == 0:
224-
filename = "layer"
225+
filename = "layer"
225226
output = getTempFilenameInTempFolder(filename + ".shp")
226227
provider = layer.dataProvider()
227228
useSelection = ProcessingConfig.getSetting(ProcessingConfig.USE_SELECTED)

‎python/plugins/processing/tools/general.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,5 @@ def extent(layers):
9393
else:
9494
return str(xmin) + "," + str(xmax) + "," + str(ymin) + "," + str(ymax)
9595

96-
def removeInvalidChars(string):
97-
validChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:"
98-
string = ''.join(c for c in string if c in validChars)
99-
return string
96+
10097

‎python/plugins/processing/tools/help.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
* *
1717
***************************************************************************
1818
"""
19-
from processing.tools.general import removeInvalidChars
2019

2120
__author__ = 'Victor Olaya'
2221
__date__ = 'March 2013'
@@ -33,7 +32,8 @@ def createBaseHelpFile(alg, folder):
3332
folder = os.path.join(folder, alg.provider.getName().lower())
3433
mkdir(folder)
3534
cmdLineName = alg.commandLineName()[alg.commandLineName().find(":") + 1:].lower()
36-
safeFilename = removeInvalidChars(cmdLineName)
35+
validChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
36+
safeFilename = ''.join(c for c in cmdLineName if c in validChars)
3737
filepath = os.path.join(folder, safeFilename + ".rst")
3838
file = open(filepath, "w")
3939
file.write(alg.name.upper())

‎python/plugins/processing/tools/system.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
* *
1717
***************************************************************************
1818
"""
19-
from processing.tools.general import removeInvalidChars
2019

2120
__author__ = 'Victor Olaya'
2221
__date__ = 'August 2012'
@@ -69,7 +68,6 @@ def getTempFilenameInTempFolder(basename):
6968
path = tempFolder()
7069
path = os.path.join(path, str(uuid.uuid4()).replace("-",""))
7170
mkdir(path)
72-
basename = removeInvalidChars(basename)
7371
filename = os.path.join(path, basename)
7472
return filename
7573

0 commit comments

Comments
 (0)
Please sign in to comment.