Python - Run pyupgrade on the processing plugin

qgis · Apr 24, 2023 · 3cab3c4 · 3cab3c4
1 parent 8282b66
commit 3cab3c4
Show file tree

Hide file tree

Showing 228 changed files with 259 additions and 713 deletions.
diff --git a/python/plugins/processing/ProcessingPlugin.py b/python/plugins/processing/ProcessingPlugin.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     ProcessingPlugin.py
@@ -111,7 +109,7 @@ def handleCustomUriDrop(self, uri):
 class ProcessingModelItem(QgsDataItem):
 
     def __init__(self, parent, name, path):
-        super(ProcessingModelItem, self).__init__(QgsDataItem.Custom, parent, name, path)
+        super().__init__(QgsDataItem.Custom, parent, name, path)
         self.setState(QgsDataItem.Populated)  # no children
         self.setIconName(":/images/themes/default/processingModel.svg")
         self.setToolTip(QDir.toNativeSeparators(path))
@@ -150,7 +148,7 @@ def actions(self, parent):
 class ProcessingDataItemProvider(QgsDataItemProvider):
 
     def __init__(self):
-        super(ProcessingDataItemProvider, self).__init__()
+        super().__init__()
 
     def name(self):
         return 'processing'

diff --git a/python/plugins/processing/__init__.py b/python/plugins/processing/__init__.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     __init__.py

diff --git a/python/plugins/processing/algs/gdal/AssignProjection.py b/python/plugins/processing/algs/gdal/AssignProjection.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     self.py

diff --git a/python/plugins/processing/algs/gdal/Buffer.py b/python/plugins/processing/algs/gdal/Buffer.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     Buffer.py
@@ -129,12 +127,12 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
         ]
 
         if dissolve or fieldName:
-            sql = 'SELECT ST_Union(ST_Buffer({}, {})) AS {}{} FROM "{}"'.format(geometry, distance, geometry, other_fields, layerName)
+            sql = f'SELECT ST_Union(ST_Buffer({geometry}, {distance})) AS {geometry}{other_fields} FROM "{layerName}"'
         else:
-            sql = 'SELECT ST_Buffer({}, {}) AS {}{} FROM "{}"'.format(geometry, distance, geometry, other_fields, layerName)
+            sql = f'SELECT ST_Buffer({geometry}, {distance}) AS {geometry}{other_fields} FROM "{layerName}"'
 
         if fieldName:
-            sql = '{} GROUP BY "{}"'.format(sql, fieldName)
+            sql = f'{sql} GROUP BY "{fieldName}"'
 
         arguments.append(sql)
 
@@ -145,6 +143,6 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             arguments.append(options)
 
         if outputFormat:
-            arguments.append('-f {}'.format(outputFormat))
+            arguments.append(f'-f {outputFormat}')
 
         return [self.commandName(), GdalUtils.escapeAndJoin(arguments)]
diff --git a/python/plugins/processing/algs/gdal/ClipRasterByExtent.py b/python/plugins/processing/algs/gdal/ClipRasterByExtent.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     ClipRasterByExtent.py
@@ -142,10 +140,10 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
 
         crs = inLayer.crs()
         if override_crs and crs.isValid():
-            arguments.append('-a_srs {}'.format(GdalUtils.gdal_crs_string(crs)))
+            arguments.append(f'-a_srs {GdalUtils.gdal_crs_string(crs)}')
 
         if nodata is not None:
-            arguments.append('-a_nodata {}'.format(nodata))
+            arguments.append(f'-a_nodata {nodata}')
 
         data_type = self.parameterAsEnum(parameters, self.DATA_TYPE, context)
         if data_type:

diff --git a/python/plugins/processing/algs/gdal/ClipRasterByMask.py b/python/plugins/processing/algs/gdal/ClipRasterByMask.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     ClipRasterByMask.py
@@ -221,12 +219,12 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             arguments.append('-tr')
             if self.X_RESOLUTION in parameters and parameters[self.X_RESOLUTION] is not None:
                 xres = self.parameterAsDouble(parameters, self.X_RESOLUTION, context)
-                arguments.append('{}'.format(xres))
+                arguments.append(f'{xres}')
             else:
                 arguments.append(str(inLayer.rasterUnitsPerPixelX()))
             if self.Y_RESOLUTION in parameters and parameters[self.Y_RESOLUTION] is not None:
                 yres = self.parameterAsDouble(parameters, self.Y_RESOLUTION, context)
-                arguments.append('{}'.format(yres))
+                arguments.append(f'{yres}')
             else:
                 arguments.append(str(-inLayer.rasterUnitsPerPixelY()))
             arguments.append('-tap')
@@ -243,7 +241,7 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             arguments.append('-dstalpha')
 
         if nodata is not None:
-            arguments.append('-dstnodata {}'.format(nodata))
+            arguments.append(f'-dstnodata {nodata}')
 
         if self.parameterAsBoolean(parameters, self.MULTITHREADING, context):
             arguments.append('-multi')

diff --git a/python/plugins/processing/algs/gdal/ClipVectorByExtent.py b/python/plugins/processing/algs/gdal/ClipVectorByExtent.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     ClipVectorByExtent.py
@@ -103,6 +101,6 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             arguments.append(options)
 
         if outputFormat:
-            arguments.append('-f {}'.format(outputFormat))
+            arguments.append(f'-f {outputFormat}')
 
         return [self.commandName(), GdalUtils.escapeAndJoin(arguments)]
diff --git a/python/plugins/processing/algs/gdal/ClipVectorByMask.py b/python/plugins/processing/algs/gdal/ClipVectorByMask.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     ClipVectorByMask.py
@@ -99,6 +97,6 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             arguments.append(options)
 
         if outputFormat:
-            arguments.append('-f {}'.format(outputFormat))
+            arguments.append(f'-f {outputFormat}')
 
         return [self.commandName(), GdalUtils.escapeAndJoin(arguments)]
diff --git a/python/plugins/processing/algs/gdal/ColorRelief.py b/python/plugins/processing/algs/gdal/ColorRelief.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     ColorRelief.py

diff --git a/python/plugins/processing/algs/gdal/Datasources2Vrt.py b/python/plugins/processing/algs/gdal/Datasources2Vrt.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     Datasources2Vrt.py
@@ -122,9 +120,9 @@ def processAlgorithm(self, parameters, context, feedback):
             basePath = GdalUtils.ogrConnectionStringFromLayer(layer)
             layerName = GdalUtils.ogrLayerName(layer.source())
 
-            vrt += '<OGRVRTLayer name="{}">'.format(html.escape(layerName, True))
-            vrt += '<SrcDataSource>{}</SrcDataSource>'.format(html.escape(basePath, True))
-            vrt += '<SrcLayer>{}</SrcLayer>'.format(html.escape(layerName, True))
+            vrt += f'<OGRVRTLayer name="{html.escape(layerName, True)}">'
+            vrt += f'<SrcDataSource>{html.escape(basePath, True)}</SrcDataSource>'
+            vrt += f'<SrcLayer>{html.escape(layerName, True)}</SrcLayer>'
             vrt += '</OGRVRTLayer>'
 
             feedback.setProgress(int(current * total))

diff --git a/python/plugins/processing/algs/gdal/Dissolve.py b/python/plugins/processing/algs/gdal/Dissolve.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     Dissolve.py
@@ -142,7 +140,7 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
 
         tokens = []
         if self.parameterAsBoolean(parameters, self.COUNT_FEATURES, context):
-            tokens.append('COUNT({}) AS count'.format(geometry))
+            tokens.append(f'COUNT({geometry}) AS count')
 
         if self.parameterAsBoolean(parameters, self.COMPUTE_AREA, context):
             tokens.append('SUM(ST_Area({0})) AS area, ST_Perimeter(ST_Union({0})) AS perimeter'.format(geometry))
@@ -157,12 +155,12 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
 
         group_by = ''
         if fieldName:
-            group_by = ' GROUP BY "{}"'.format(fieldName)
+            group_by = f' GROUP BY "{fieldName}"'
 
         if self.parameterAsBoolean(parameters, self.KEEP_ATTRIBUTES, context):
-            sql = 'SELECT ST_Union({}) AS {}{}{} FROM "{}"{}'.format(geometry, geometry, other_fields, params, layerName, group_by)
+            sql = f'SELECT ST_Union({geometry}) AS {geometry}{other_fields}{params} FROM "{layerName}"{group_by}'
         else:
-            sql = 'SELECT ST_Union({}) AS {}{}{} FROM "{}"{}'.format(geometry, geometry, ', "{}"'.format(fieldName) if fieldName else '',
+            sql = 'SELECT ST_Union({}) AS {}{}{} FROM "{}"{}'.format(geometry, geometry, f', "{fieldName}"' if fieldName else '',
                                                                      params, layerName, group_by)
 
         arguments.append(sql)
@@ -174,6 +172,6 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             arguments.append(options)
 
         if outputFormat:
-            arguments.append('-f {}'.format(outputFormat))
+            arguments.append(f'-f {outputFormat}')
 
         return [self.commandName(), GdalUtils.escapeAndJoin(arguments)]
diff --git a/python/plugins/processing/algs/gdal/ExecuteSql.py b/python/plugins/processing/algs/gdal/ExecuteSql.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     ExecuteSql.py
@@ -110,6 +108,6 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             arguments.append(options)
 
         if outputFormat:
-            arguments.append('-f {}'.format(outputFormat))
+            arguments.append(f'-f {outputFormat}')
 
         return [self.commandName(), GdalUtils.escapeAndJoin(arguments)]
diff --git a/python/plugins/processing/algs/gdal/GdalAlgorithm.py b/python/plugins/processing/algs/gdal/GdalAlgorithm.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     GdalAlgorithm.py
@@ -118,7 +116,7 @@ def getOgrCompatibleSource(self, parameter_name, parameters, context, feedback,
         elif input_layer.dataProvider().name().lower() == 'wfs':
             uri = QgsDataSourceUri(input_layer.source())
             baseUrl = uri.param('url').split('?')[0]
-            ogr_data_path = "WFS:{}".format(baseUrl)
+            ogr_data_path = f"WFS:{baseUrl}"
             ogr_layer_name = uri.param('typename')
         else:
             # vector layer, but not OGR - get OGR compatible path

diff --git a/python/plugins/processing/algs/gdal/GdalAlgorithmDialog.py b/python/plugins/processing/algs/gdal/GdalAlgorithmDialog.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     GdalAlgorithmDialog.py

diff --git a/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py b/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     GdalAlgorithmProvider.py
@@ -126,7 +124,7 @@ def name(self):
 
     def longName(self):
         version = GdalUtils.readableVersion()
-        return 'GDAL ({})'.format(version)
+        return f'GDAL ({version})'
 
     def id(self):
         return 'gdal'

diff --git a/python/plugins/processing/algs/gdal/GdalUtils.py b/python/plugins/processing/algs/gdal/GdalUtils.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     GdalUtils.py
@@ -81,7 +79,7 @@ def runGdal(commands, feedback=None):
         isDarwin = False
         try:
             isDarwin = platform.system() == 'Darwin'
-        except IOError:  # https://travis-ci.org/m-kuhn/QGIS#L1493-L1526
+        except OSError:  # https://travis-ci.org/m-kuhn/QGIS#L1493-L1526
             pass
         if isDarwin and os.path.isfile(os.path.join(QgsApplication.prefixPath(), "bin", "gdalinfo")):
             # Looks like there's a bundled gdal. Let's use it.
@@ -92,7 +90,7 @@ def runGdal(commands, feedback=None):
             settings = QgsSettings()
             path = settings.value('/GdalTools/gdalPath', '')
             if not path.lower() in envval.lower().split(os.pathsep):
-                envval += '{}{}'.format(os.pathsep, path)
+                envval += f'{os.pathsep}{path}'
                 os.putenv('PATH', envval)
 
         fused_command = ' '.join([str(c) for c in commands])
@@ -352,15 +350,15 @@ def ogrConnectionStringAndFormatFromLayer(layer):
             # #(Shape) sql='
             dsUri = layer.dataProvider().uri()
             ogrstr = 'MSSQL:'
-            ogrstr += 'database={0};'.format(dsUri.database())
-            ogrstr += 'server={0};'.format(dsUri.host())
+            ogrstr += f'database={dsUri.database()};'
+            ogrstr += f'server={dsUri.host()};'
             if dsUri.username() != "":
-                ogrstr += 'uid={0};'.format(dsUri.username())
+                ogrstr += f'uid={dsUri.username()};'
             else:
                 ogrstr += 'trusted_connection=yes;'
             if dsUri.password() != '':
-                ogrstr += 'pwd={0};'.format(dsUri.password())
-            ogrstr += 'tables={0}'.format(dsUri.table())
+                ogrstr += f'pwd={dsUri.password()};'
+            ogrstr += f'tables={dsUri.table()}'
             format = 'MSSQL'
         elif provider == "oracle":
             # OCI:user/password@host:port/service:table
@@ -395,7 +393,7 @@ def ogrConnectionStringAndFormatFromLayer(layer):
         elif provider.lower() == "wfs":
             uri = QgsDataSourceUri(layer.source())
             baseUrl = uri.param('url').split('?')[0]
-            ogrstr = "WFS:{}".format(baseUrl)
+            ogrstr = f"WFS:{baseUrl}"
             format = 'WFS'
         else:
             ogrstr = str(layer.source()).split("|")[0]

diff --git a/python/plugins/processing/algs/gdal/GridAverage.py b/python/plugins/processing/algs/gdal/GridAverage.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     GridAverage.py
@@ -156,11 +154,11 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             arguments.append(fieldName)
 
         params = 'average'
-        params += ':radius1={}'.format(self.parameterAsDouble(parameters, self.RADIUS_1, context))
-        params += ':radius2={}'.format(self.parameterAsDouble(parameters, self.RADIUS_2, context))
-        params += ':angle={}'.format(self.parameterAsDouble(parameters, self.ANGLE, context))
-        params += ':min_points={}'.format(self.parameterAsInt(parameters, self.MIN_POINTS, context))
-        params += ':nodata={}'.format(self.parameterAsDouble(parameters, self.NODATA, context))
+        params += f':radius1={self.parameterAsDouble(parameters, self.RADIUS_1, context)}'
+        params += f':radius2={self.parameterAsDouble(parameters, self.RADIUS_2, context)}'
+        params += f':angle={self.parameterAsDouble(parameters, self.ANGLE, context)}'
+        params += f':min_points={self.parameterAsInt(parameters, self.MIN_POINTS, context)}'
+        params += f':nodata={self.parameterAsDouble(parameters, self.NODATA, context)}'
 
         arguments.append('-a')
         arguments.append(params)

diff --git a/python/plugins/processing/algs/gdal/GridDataMetrics.py b/python/plugins/processing/algs/gdal/GridDataMetrics.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     GridDataMetrics.py
@@ -170,11 +168,11 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             arguments.append(fieldName)
 
         params = self.metrics[self.parameterAsEnum(parameters, self.METRIC, context)][1]
-        params += ':radius1={}'.format(self.parameterAsDouble(parameters, self.RADIUS_1, context))
-        params += ':radius2={}'.format(self.parameterAsDouble(parameters, self.RADIUS_2, context))
-        params += ':angle={}'.format(self.parameterAsDouble(parameters, self.ANGLE, context))
-        params += ':min_points={}'.format(self.parameterAsInt(parameters, self.MIN_POINTS, context))
-        params += ':nodata={}'.format(self.parameterAsDouble(parameters, self.NODATA, context))
+        params += f':radius1={self.parameterAsDouble(parameters, self.RADIUS_1, context)}'
+        params += f':radius2={self.parameterAsDouble(parameters, self.RADIUS_2, context)}'
+        params += f':angle={self.parameterAsDouble(parameters, self.ANGLE, context)}'
+        params += f':min_points={self.parameterAsInt(parameters, self.MIN_POINTS, context)}'
+        params += f':nodata={self.parameterAsDouble(parameters, self.NODATA, context)}'
 
         arguments.append('-a')
         arguments.append(params)

diff --git a/python/plugins/processing/algs/gdal/GridInverseDistance.py b/python/plugins/processing/algs/gdal/GridInverseDistance.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 ***************************************************************************
     GridInverseDistance.py
@@ -176,14 +174,14 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             arguments.append(fieldName)
 
         params = 'invdist'
-        params += ':power={}'.format(self.parameterAsDouble(parameters, self.POWER, context))
-        params += ':smoothing={}'.format(self.parameterAsDouble(parameters, self.SMOOTHING, context))
-        params += ':radius1={}'.format(self.parameterAsDouble(parameters, self.RADIUS_1, context))
-        params += ':radius2={}'.format(self.parameterAsDouble(parameters, self.RADIUS_2, context))
-        params += ':angle={}'.format(self.parameterAsDouble(parameters, self.ANGLE, context))
-        params += ':max_points={}'.format(self.parameterAsInt(parameters, self.MAX_POINTS, context))
-        params += ':min_points={}'.format(self.parameterAsInt(parameters, self.MIN_POINTS, context))
-        params += ':nodata={}'.format(self.parameterAsDouble(parameters, self.NODATA, context))
+        params += f':power={self.parameterAsDouble(parameters, self.POWER, context)}'
+        params += f':smoothing={self.parameterAsDouble(parameters, self.SMOOTHING, context)}'
+        params += f':radius1={self.parameterAsDouble(parameters, self.RADIUS_1, context)}'
+        params += f':radius2={self.parameterAsDouble(parameters, self.RADIUS_2, context)}'
+        params += f':angle={self.parameterAsDouble(parameters, self.ANGLE, context)}'
+        params += f':max_points={self.parameterAsInt(parameters, self.MAX_POINTS, context)}'
+        params += f':min_points={self.parameterAsInt(parameters, self.MIN_POINTS, context)}'
+        params += f':nodata={self.parameterAsDouble(parameters, self.NODATA, context)}'
 
         arguments.append('-a')
         arguments.append(params)