From 579ef1c5c1be290a476f3648dd723ab8ba3ae9b5 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Thu, 2 Apr 2020 09:11:23 +1000 Subject: [PATCH] Fix use of enum flags in older python/sip versions --- python/plugins/processing/gui/AlgorithmDialog.py | 2 +- tests/src/python/test_qgsxmlutils.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/python/plugins/processing/gui/AlgorithmDialog.py b/python/plugins/processing/gui/AlgorithmDialog.py index b13fe9d6bfb..069a9526087 100644 --- a/python/plugins/processing/gui/AlgorithmDialog.py +++ b/python/plugins/processing/gui/AlgorithmDialog.py @@ -210,7 +210,7 @@ class AlgorithmDialog(QgsProcessingAlgorithmDialogBase): self.iterateParam = None for param in self.algorithm().parameterDefinitions(): - if isinstance(parameters.get(param.name(), None), QgsProcessingFeatureSourceDefinition) and parameters[param.name()].flags & QgsProcessingFeatureSourceDefinition.Flag.FlagCreateIndividualOutputPerInputFeature: + if isinstance(parameters.get(param.name(), None), QgsProcessingFeatureSourceDefinition) and parameters[param.name()].flags & QgsProcessingFeatureSourceDefinition.Flag.FlagCreateIndividualOutputPerInputFeature.value: self.iterateParam = param.name() break diff --git a/tests/src/python/test_qgsxmlutils.py b/tests/src/python/test_qgsxmlutils.py index 1e6747e389f..ae3f9d36675 100644 --- a/tests/src/python/test_qgsxmlutils.py +++ b/tests/src/python/test_qgsxmlutils.py @@ -261,8 +261,7 @@ class TestQgsXmlUtils(unittest.TestCase): self.assertEqual(c.source.staticValue(), 'my source') self.assertTrue(c.selectedFeaturesOnly) self.assertEqual(c.featureLimit, 27) - # Travis won't allow this -- maybe Python version related? - #self.assertEqual(c.flags, QgsProcessingFeatureSourceDefinition.Flag.FlagCreateIndividualOutputPerInputFeature) + self.assertEqual(c.flags, QgsProcessingFeatureSourceDefinition.Flag.FlagCreateIndividualOutputPerInputFeature.value) self.assertEqual(c.geometryCheck, QgsFeatureRequest.GeometrySkipInvalid) def test_output_layer_definition(self):