sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-28 00:05:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove unused variable

Browse Source 
fix tests
This commit is contained in:
Alexander Bruy 2019-11-02 12:26:52 +02:00 committed by Nyall Dawson
parent 74d6e099e6
commit 3701d360a1
2 changed files with 2 additions and 4 deletions
python/plugins/processing
algs/gdal
gdalcalc.py
tests
GdalAlgorithmsRasterTest.py

4
python/plugins/processing/algs/gdal/gdalcalc.py

@ -256,10 +256,8 @@ class gdalcalc(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context) options = self.parameterAsString(parameters, self.OPTIONS, context)
if options: if options:
parts = options.split('|') parts = options.split('|')
options = []
for p in parts: for p in parts:
option = '--co ' + p arguments.append('--co ' + p)
arguments.append(option)
if self.EXTRA in parameters and parameters[self.EXTRA] not in (None, ''): if self.EXTRA in parameters and parameters[self.EXTRA] not in (None, ''):
extra = self.parameterAsString(parameters, self.EXTRA, context) extra = self.parameterAsString(parameters, self.EXTRA, context)

2
python/plugins/processing/tests/GdalAlgorithmsRasterTest.py

@ -601,7 +601,7 @@ class TestGdalRasterAlgorithms(unittest.TestCase, AlgorithmsTestBase.AlgorithmsT
'OPTIONS': 'COMPRESS=JPEG|JPEG_QUALITY=75', 'OPTIONS': 'COMPRESS=JPEG|JPEG_QUALITY=75',
'OUTPUT': output}, context, feedback), 'OUTPUT': output}, context, feedback),
['gdal_calc.py', ['gdal_calc.py',
'--calc "{}" --format JPEG --type Float32 -A {} --A_band 1 -co COMPRESS=JPEG -co JPEG_QUALITY=75 --outfile {}'.format(formula, source, output)]) '--calc "{}" --format JPEG --type Float32 -A {} --A_band 1 --co COMPRESS=JPEG --co JPEG_QUALITY=75 --outfile {}'.format(formula, source, output)])
# additional parameters # additional parameters
formula = 'A*2' formula = 'A*2'