Thin out unneeded function calls

qgis · Feb 20, 2021 · dcde81f · dcde81f
1 parent da5f9db
commit dcde81f
Show file tree

Hide file tree

Showing 46 changed files with 348 additions and 324 deletions.
diff --git a/python/plugins/processing/algs/gdal/AssignProjection.py b/python/plugins/processing/algs/gdal/AssignProjection.py
@@ -82,11 +82,12 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
 
         crs = self.parameterAsCrs(parameters, self.CRS, context)
 
-        arguments = []
-        arguments.append('-a_srs')
-        arguments.append(GdalUtils.gdal_crs_string(crs))
+        arguments = [
+            '-a_srs',
+            GdalUtils.gdal_crs_string(crs),
 
-        arguments.append(fileName)
+            fileName
+        ]
 
         if isWindows():
             commands = ["python3", "-m", self.commandName()]

diff --git a/python/plugins/processing/algs/gdal/ClipRasterByExtent.py b/python/plugins/processing/algs/gdal/ClipRasterByExtent.py
@@ -132,12 +132,13 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
         out = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)
         self.setOutputValue(self.OUTPUT, out)
 
-        arguments = []
-        arguments.append('-projwin')
-        arguments.append(str(bbox.xMinimum()))
-        arguments.append(str(bbox.yMaximum()))
-        arguments.append(str(bbox.xMaximum()))
-        arguments.append(str(bbox.yMinimum()))
+        arguments = [
+            '-projwin',
+            str(bbox.xMinimum()),
+            str(bbox.yMaximum()),
+            str(bbox.xMaximum()),
+            str(bbox.yMinimum()),
+        ]
 
         crs = inLayer.crs()
         if override_crs and crs.isValid():

diff --git a/python/plugins/processing/algs/gdal/ClipVectorByExtent.py b/python/plugins/processing/algs/gdal/ClipVectorByExtent.py
@@ -86,17 +86,18 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
 
         output, outputFormat = GdalUtils.ogrConnectionStringAndFormat(outFile, context)
 
-        arguments = []
-        arguments.append('-spat')
-        arguments.append(str(extent.xMinimum()))
-        arguments.append(str(extent.yMaximum()))
-        arguments.append(str(extent.xMaximum()))
-        arguments.append(str(extent.yMinimum()))
-        arguments.append('-clipsrc spat_extent')
-
-        arguments.append(output)
-        arguments.append(ogrLayer)
-        arguments.append(layerName)
+        arguments = [
+            '-spat',
+            str(extent.xMinimum()),
+            str(extent.yMaximum()),
+            str(extent.xMaximum()),
+            str(extent.yMinimum()),
+            '-clipsrc spat_extent',
+
+            output,
+            ogrLayer,
+            layerName
+        ]
 
         if options:
             arguments.append(options)

diff --git a/python/plugins/processing/algs/gdal/ClipVectorByMask.py b/python/plugins/processing/algs/gdal/ClipVectorByMask.py
@@ -84,15 +84,16 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
 
         output, outputFormat = GdalUtils.ogrConnectionStringAndFormat(outFile, context)
 
-        arguments = []
-        arguments.append('-clipsrc')
-        arguments.append(maskLayer)
-        arguments.append('-clipsrclayer')
-        arguments.append(maskLayerName)
-
-        arguments.append(output)
-        arguments.append(inLayer)
-        arguments.append(inLayerName)
+        arguments = [
+            '-clipsrc',
+            maskLayer,
+            '-clipsrclayer',
+            maskLayerName,
+
+            output,
+            inLayer,
+            inLayerName,
+        ]
 
         if options:
             arguments.append(options)

diff --git a/python/plugins/processing/algs/gdal/Dissolve.py b/python/plugins/processing/algs/gdal/Dissolve.py
@@ -59,32 +59,33 @@ def initAlgorithm(self, config=None):
         self.addParameter(QgsProcessingParameterString(self.GEOMETRY,
                                                        self.tr('Geometry column name'),
                                                        defaultValue='geometry'))
-        params = []
-        params.append(QgsProcessingParameterBoolean(self.EXPLODE_COLLECTIONS,
-                                                    self.tr('Produce one feature for each geometry in any kind of geometry collection in the source file'),
-                                                    defaultValue=False))
-        params.append(QgsProcessingParameterBoolean(self.KEEP_ATTRIBUTES,
-                                                    self.tr('Keep input attributes'),
-                                                    defaultValue=False))
-        params.append(QgsProcessingParameterBoolean(self.COUNT_FEATURES,
-                                                    self.tr('Count dissolved features'),
-                                                    defaultValue=False))
-        params.append(QgsProcessingParameterBoolean(self.COMPUTE_AREA,
-                                                    self.tr('Compute area and perimeter of dissolved features'),
-                                                    defaultValue=False))
-        params.append(QgsProcessingParameterBoolean(self.COMPUTE_STATISTICS,
-                                                    self.tr('Compute min/max/sum/mean for attribute'),
-                                                    defaultValue=False))
-        params.append(QgsProcessingParameterField(self.STATISTICS_ATTRIBUTE,
-                                                  self.tr('Numeric attribute to calculate statistics on'),
-                                                  None,
-                                                  self.INPUT,
-                                                  QgsProcessingParameterField.Numeric,
-                                                  optional=True))
-        params.append(QgsProcessingParameterString(self.OPTIONS,
-                                                   self.tr('Additional creation options'),
-                                                   defaultValue='',
-                                                   optional=True))
+        params = [
+            QgsProcessingParameterBoolean(self.EXPLODE_COLLECTIONS,
+                                          self.tr('Produce one feature for each geometry in any kind of geometry collection in the source file'),
+                                          defaultValue=False,),
+            QgsProcessingParameterBoolean(self.KEEP_ATTRIBUTES,
+                                          self.tr('Keep input attributes'),
+                                          defaultValue=False),
+            QgsProcessingParameterBoolean(self.COUNT_FEATURES,
+                                          self.tr('Count dissolved features'),
+                                          defaultValue=False),
+            QgsProcessingParameterBoolean(self.COMPUTE_AREA,
+                                          self.tr('Compute area and perimeter of dissolved features'),
+                                          defaultValue=False),
+            QgsProcessingParameterBoolean(self.COMPUTE_STATISTICS,
+                                          self.tr('Compute min/max/sum/mean for attribute'),
+                                          defaultValue=False),
+            QgsProcessingParameterField(self.STATISTICS_ATTRIBUTE,
+                                        self.tr('Numeric attribute to calculate statistics on'),
+                                        None,
+                                        self.INPUT,
+                                        QgsProcessingParameterField.Numeric,
+                                        optional=True),
+            QgsProcessingParameterString(self.OPTIONS,
+                                         self.tr('Additional creation options'),
+                                         defaultValue='',
+                                         optional=True)
+        ]
         for param in params:
             param.setFlags(param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
             self.addParameter(param)
@@ -135,13 +136,14 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
         else:
             other_fields = ''
 
-        arguments = []
-        arguments.append(output)
-        arguments.append(ogrLayer)
-        arguments.append('-nlt PROMOTE_TO_MULTI')
-        arguments.append('-dialect')
-        arguments.append('sqlite')
-        arguments.append('-sql')
+        arguments = [
+            output,
+            ogrLayer,
+            '-nlt PROMOTE_TO_MULTI',
+            '-dialect',
+            'sqlite',
+            '-sql',
+        ]
 
         tokens = []
         if self.parameterAsBoolean(parameters, self.COUNT_FEATURES, context):

diff --git a/python/plugins/processing/algs/gdal/ExecuteSql.py b/python/plugins/processing/algs/gdal/ExecuteSql.py
@@ -95,12 +95,12 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             raise QgsProcessingException(
                 self.tr('Empty SQL. Please enter valid SQL expression and try again.'))
 
-        arguments = []
-        arguments.append(output)
-        arguments.append(ogrLayer)
-        arguments.append('-sql')
-        arguments.append(sql)
-
+        arguments = [
+            output,
+            ogrLayer,
+            '-sql',
+            sql
+        ]
         dialect = self.dialects[self.parameterAsEnum(parameters, self.DIALECT, context)][1]
         if dialect:
             arguments.append('-dialect')

diff --git a/python/plugins/processing/algs/gdal/GdalAlgorithm.py b/python/plugins/processing/algs/gdal/GdalAlgorithm.py
@@ -145,9 +145,10 @@ def processAlgorithm(self, parameters, context, feedback):
         return results
 
     def commandName(self):
-        parameters = {}
-        for param in self.parameterDefinitions():
-            parameters[param.name()] = "1"
+        parameters = {
+            param.name(): "1"
+            for param in self.parameterDefinitions()
+        }
         context = QgsProcessingContext()
         feedback = QgsProcessingFeedback()
         name = self.getConsoleCommands(parameters, context, feedback, executing=False)[0]

diff --git a/python/plugins/processing/algs/gdal/GridDataMetrics.py b/python/plugins/processing/algs/gdal/GridDataMetrics.py
@@ -160,9 +160,10 @@ def commandName(self):
     def getConsoleCommands(self, parameters, context, feedback, executing=True):
         ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback, executing)
 
-        arguments = ['-l']
-        arguments.append(layerName)
-
+        arguments = [
+            '-l',
+            layerName
+        ]
         fieldName = self.parameterAsString(parameters, self.Z_FIELD, context)
         if fieldName:
             arguments.append('-zfield')

diff --git a/python/plugins/processing/algs/gdal/GridInverseDistance.py b/python/plugins/processing/algs/gdal/GridInverseDistance.py
@@ -166,9 +166,10 @@ def commandName(self):
     def getConsoleCommands(self, parameters, context, feedback, executing=True):
         ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback, executing)
 
-        arguments = ['-l']
-        arguments.append(layerName)
-
+        arguments = [
+            '-l',
+            layerName
+        ]
         fieldName = self.parameterAsString(parameters, self.Z_FIELD, context)
         if fieldName:
             arguments.append('-zfield')

diff --git a/python/plugins/processing/algs/gdal/GridInverseDistanceNearestNeighbor.py b/python/plugins/processing/algs/gdal/GridInverseDistanceNearestNeighbor.py
@@ -153,9 +153,10 @@ def commandName(self):
     def getConsoleCommands(self, parameters, context, feedback, executing=True):
         ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback, executing)
 
-        arguments = ['-l']
-        arguments.append(layerName)
-
+        arguments = [
+            '-l',
+            layerName
+        ]
         fieldName = self.parameterAsString(parameters, self.Z_FIELD, context)
         if fieldName:
             arguments.append('-zfield')

diff --git a/python/plugins/processing/algs/gdal/GridLinear.py b/python/plugins/processing/algs/gdal/GridLinear.py
@@ -129,9 +129,10 @@ def commandName(self):
     def getConsoleCommands(self, parameters, context, feedback, executing=True):
         ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback, executing)
 
-        arguments = ['-l']
-        arguments.append(layerName)
-
+        arguments = [
+            '-l',
+            layerName
+        ]
         fieldName = self.parameterAsString(parameters, self.Z_FIELD, context)
         if fieldName:
             arguments.append('-zfield')

diff --git a/python/plugins/processing/algs/gdal/GridNearestNeighbor.py b/python/plugins/processing/algs/gdal/GridNearestNeighbor.py
@@ -141,9 +141,10 @@ def commandName(self):
     def getConsoleCommands(self, parameters, context, feedback, executing=True):
         ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback, executing)
 
-        arguments = ['-l']
-        arguments.append(layerName)
-
+        arguments = [
+            '-l',
+            layerName
+        ]
         fieldName = self.parameterAsString(parameters, self.Z_FIELD, context)
         if fieldName:
             arguments.append('-zfield')

diff --git a/python/plugins/processing/algs/gdal/OffsetCurve.py b/python/plugins/processing/algs/gdal/OffsetCurve.py
@@ -107,13 +107,13 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
         else:
             other_fields = ''
 
-        arguments = []
-        arguments.append(output)
-        arguments.append(ogrLayer)
-        arguments.append('-dialect')
-        arguments.append('sqlite')
-        arguments.append('-sql')
-
+        arguments = [
+            output,
+            ogrLayer,
+            '-dialect',
+            'sqlite',
+            '-sql'
+        ]
         sql = 'SELECT ST_OffsetCurve({}, {}) AS {}{} FROM "{}"'.format(geometry, distance, geometry, other_fields, layerName)
         arguments.append(sql)
 

diff --git a/python/plugins/processing/algs/gdal/OneSideBuffer.py b/python/plugins/processing/algs/gdal/OneSideBuffer.py
@@ -125,23 +125,24 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
 
         output, outputFormat = GdalUtils.ogrConnectionStringAndFormat(outFile, context)
 
-        other_fields = []
-        for f in fields:
-            if f.name() == geometry:
-                continue
-            other_fields.append('"{}"'.format(f.name()))
+        other_fields = [
+            '"{}"'.format(f.name())
+            for f in fields
+            if f.name() != geometry
+        ]
 
         if other_fields:
             other_fields = ',*'
         else:
             other_fields = ''
 
-        arguments = []
-        arguments.append(output)
-        arguments.append(ogrLayer)
-        arguments.append('-dialect')
-        arguments.append('sqlite')
-        arguments.append('-sql')
+        arguments = [
+            output,
+            ogrLayer,
+            '-dialect',
+            'sqlite',
+            '-sql'
+        ]
 
         if dissolve or fieldName:
             sql = 'SELECT ST_Union(ST_SingleSidedBuffer({}, {}, {})) AS {}{} FROM "{}"'.format(geometry, distance, side, geometry, other_fields, layerName)

diff --git a/python/plugins/processing/algs/gdal/PointsAlongLines.py b/python/plugins/processing/algs/gdal/PointsAlongLines.py
@@ -111,13 +111,13 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
         else:
             other_fields = ''
 
-        arguments = []
-        arguments.append(output)
-        arguments.append(ogrLayer)
-        arguments.append('-dialect')
-        arguments.append('sqlite')
-        arguments.append('-sql')
-
+        arguments = [
+            output,
+            ogrLayer,
+            '-dialect',
+            'sqlite',
+            '-sql'
+        ]
         sql = 'SELECT ST_Line_Interpolate_Point({}, {}) AS {}{} FROM "{}"'.format(geometry, distance, geometry, other_fields, layerName)
         arguments.append(sql)
 

diff --git a/python/plugins/processing/algs/gdal/buildvrt.py b/python/plugins/processing/algs/gdal/buildvrt.py
@@ -176,9 +176,11 @@ def commandName(self):
         return "gdalbuildvrt"
 
     def getConsoleCommands(self, parameters, context, feedback, executing=True):
-        arguments = []
-        arguments.append('-resolution')
-        arguments.append(self.RESOLUTION_OPTIONS[self.parameterAsEnum(parameters, self.RESOLUTION, context)][1])
+        arguments = [
+            '-resolution',
+            self.RESOLUTION_OPTIONS[self.parameterAsEnum(parameters, self.RESOLUTION, context)][1]
+        ]
+
         if self.parameterAsBoolean(parameters, buildvrt.SEPARATE, context):
             arguments.append('-separate')
         if self.parameterAsBoolean(parameters, buildvrt.PROJ_DIFFERENCE, context):

diff --git a/python/plugins/processing/algs/gdal/contour.py b/python/plugins/processing/algs/gdal/contour.py
@@ -154,10 +154,10 @@ def _buildArgsList(self, parameters, context, feedback, executing):
         self.setOutputValue(self.OUTPUT, outFile)
         output, outFormat = GdalUtils.ogrConnectionStringAndFormat(outFile, context)
 
-        arguments = []
-        arguments.append('-b')
-        arguments.append(str(self.parameterAsInt(parameters, self.BAND, context)))
-
+        arguments = [
+            '-b',
+            str(self.parameterAsInt(parameters, self.BAND, context))
+        ]
         if fieldName:
             arguments.append('-a')
             arguments.append(fieldName)

diff --git a/python/plugins/processing/algs/gdal/fillnodata.py b/python/plugins/processing/algs/gdal/fillnodata.py
@@ -115,9 +115,10 @@ def flags(self):
         return super().flags() | QgsProcessingAlgorithm.FlagDisplayNameIsLiteral
 
     def getConsoleCommands(self, parameters, context, feedback, executing=True):
-        arguments = []
-        arguments.append('-md')
-        arguments.append(str(self.parameterAsInt(parameters, self.DISTANCE, context)))
+        arguments = [
+            '-md',
+            str(self.parameterAsInt(parameters, self.DISTANCE, context)),
+        ]
 
         nIterations = self.parameterAsInt(parameters, self.ITERATIONS, context)
         if nIterations: