Run pyqt5 to 6 script

For starting Qt6 support
north-road · May 24, 2024 · 21514f7 · 21514f7
1 parent ea8d13e
commit 21514f7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/processing_saga_nextgen/processing/SagaAlgorithm.py b/processing_saga_nextgen/processing/SagaAlgorithm.py
@@ -237,7 +237,7 @@ def processAlgorithm(self, parameters, context, feedback):  # pylint: disable=mi
                 layers = self.parameterAsLayerList(parameters, param.name(), context)
                 if layers is None or len(layers) == 0:
                     continue
-                if param.layerType() == QgsProcessing.TypeRaster:
+                if param.layerType() == QgsProcessing.SourceType.TypeRaster:
                     files = []
                     for i, layer in enumerate(layers):
                         if layer.source().lower().endswith('sdat'):
@@ -319,7 +319,7 @@ def processAlgorithm(self, parameters, context, feedback):  # pylint: disable=mi
                 for i in range(4):
                     command += ' -{} {}'.format(param.name().split(' ')[i], float(values[i]) + offset[i])
             elif isinstance(param, QgsProcessingParameterNumber):
-                if param.dataType() == QgsProcessingParameterNumber.Integer:
+                if param.dataType() == QgsProcessingParameterNumber.Type.Integer:
                     command += ' -{} {}'.format(param.name(), self.parameterAsInt(parameters, param.name(), context))
                 else:
                     command += ' -{} {}'.format(param.name(), self.parameterAsDouble(parameters, param.name(), context))
@@ -366,7 +366,7 @@ def processAlgorithm(self, parameters, context, feedback):  # pylint: disable=mi
             feedback.pushCommandInfo(line)
             loglines.append(line)
         if ProcessingConfig.getSetting(SagaUtils.SAGA_LOG_COMMANDS):
-            QgsMessageLog.logMessage('\n'.join(loglines), self.tr('Processing'), Qgis.Info)
+            QgsMessageLog.logMessage('\n'.join(loglines), self.tr('Processing'), Qgis.MessageLevel.Info)
         SagaUtils.executeSaga(feedback)
 
         if crs is not None:
@@ -477,7 +477,7 @@ def checkParameterValues(self, parameters, context):  # pylint: disable=missing-
             if isinstance(param, QgsProcessingParameterRasterLayer):
                 raster_layer_params.append(param.name())
             elif isinstance(param,
-                            QgsProcessingParameterMultipleLayers) and param.layerType() == QgsProcessing.TypeRaster:
+                            QgsProcessingParameterMultipleLayers) and param.layerType() == QgsProcessing.SourceType.TypeRaster:
                 raster_layer_params.extend(param.name())
 
         for layer_param in raster_layer_params:

diff --git a/processing_saga_nextgen/processing/provider.py b/processing_saga_nextgen/processing/provider.py
@@ -54,15 +54,15 @@ def loadAlgorithms(self):  # pylint:disable=missing-docstring
         if version is None:
             QgsMessageLog.logMessage(
                 self.tr('Problem with SAGA installation: SAGA was not found or is not correctly installed'),
-                self.tr('Processing'), Qgis.Critical)
+                self.tr('Processing'), Qgis.MessageLevel.Critical)
             return
 
         if version < SagaUtils.REQUIRED_VERSION:
             QgsMessageLog.logMessage(
                 self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: >={}).').format(
                     version, SagaUtils.REQUIRED_VERSION),
                 self.tr('Processing'),
-                Qgis.Critical)
+                Qgis.MessageLevel.Critical)
 
         self.algs = []
         folder = SagaUtils.sagaDescriptionPath()
@@ -74,11 +74,11 @@ def loadAlgorithms(self):  # pylint:disable=missing-docstring
                         self.algs.append(alg)
                     else:
                         QgsMessageLog.logMessage(self.tr('Could not open SAGA algorithm: {}'.format(descriptionFile)),
-                                                 self.tr('Processing'), Qgis.Critical)
+                                                 self.tr('Processing'), Qgis.MessageLevel.Critical)
                 except Exception as e:  # pylint: disable=broad-except
                     QgsMessageLog.logMessage(
                         self.tr('Could not open SAGA algorithm: {}\n{}'.format(descriptionFile, str(e))),
-                        self.tr('Processing'), Qgis.Critical)
+                        self.tr('Processing'), Qgis.MessageLevel.Critical)
 
         self.algs.append(SplitRGBBands())
         for a in self.algs:

diff --git a/processing_saga_nextgen/processing/utils.py b/processing_saga_nextgen/processing/utils.py
@@ -104,7 +104,7 @@ def sagaPath():
         if folder and not os.path.isdir(folder):
             folder = None
             QgsMessageLog.logMessage('Specified SAGA folder does not exist. Will try to find built-in binaries.',
-                                     'Processing', Qgis.Warning)
+                                     'Processing', Qgis.MessageLevel.Warning)
 
         if not folder:
             folder = SagaUtils.findSagaFolder()
@@ -229,7 +229,7 @@ def executeSaga(feedback):
                 pass
 
         if ProcessingConfig.getSetting(SagaUtils.SAGA_LOG_CONSOLE):
-            QgsMessageLog.logMessage('\n'.join(loglines), 'Processing', Qgis.Info)
+            QgsMessageLog.logMessage('\n'.join(loglines), 'Processing', Qgis.MessageLevel.Info)
 
     @staticmethod
     def make_path_safe(path: str) -> str:

diff --git a/processing_saga_nextgen/tests/AlgorithmsTestBase.py b/processing_saga_nextgen/tests/AlgorithmsTestBase.py
@@ -123,7 +123,7 @@ def check_algorithm(self, name, defs):
 
         if 'skipInvalid' in defs and defs['skipInvalid']:
             context.setInvalidGeometryCheck(
-                QgsFeatureRequest.GeometrySkipInvalid)
+                QgsFeatureRequest.InvalidGeometryCheck.GeometrySkipInvalid)
 
         feedback = QgsProcessingFeedback()
 

diff --git a/processing_saga_nextgen/tests/test_saga_algorithms.py b/processing_saga_nextgen/tests/test_saga_algorithms.py
@@ -69,9 +69,9 @@ def test_param_line(self):
         self.assertEqual(param.name(), 'R_PERCTL_MIN')
         self.assertEqual(param.description(), 'Percentiles Range for RED max')
         self.assertEqual(param.dataType(),
-                         QgsProcessingParameterNumber.Integer)
+                         QgsProcessingParameterNumber.Type.Integer)
         self.assertFalse(
-            param.flags() & QgsProcessingParameterDefinition.FlagOptional)
+            param.flags() & QgsProcessingParameterDefinition.Flag.FlagOptional)
         self.assertEqual(param.minimum(), 1)
         self.assertEqual(param.maximum(), 99)