Fix use of enum flags in older python/sip versions

This commit is contained in:
Nyall Dawson 2020-04-02 09:11:23 +10:00
parent acf7273220
commit 579ef1c5c1
2 changed files with 2 additions and 3 deletions

View File

@ -210,7 +210,7 @@ class AlgorithmDialog(QgsProcessingAlgorithmDialogBase):
self.iterateParam = None self.iterateParam = None
for param in self.algorithm().parameterDefinitions(): 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() self.iterateParam = param.name()
break break

View File

@ -261,8 +261,7 @@ class TestQgsXmlUtils(unittest.TestCase):
self.assertEqual(c.source.staticValue(), 'my source') self.assertEqual(c.source.staticValue(), 'my source')
self.assertTrue(c.selectedFeaturesOnly) self.assertTrue(c.selectedFeaturesOnly)
self.assertEqual(c.featureLimit, 27) self.assertEqual(c.featureLimit, 27)
# Travis won't allow this -- maybe Python version related? self.assertEqual(c.flags, QgsProcessingFeatureSourceDefinition.Flag.FlagCreateIndividualOutputPerInputFeature.value)
#self.assertEqual(c.flags, QgsProcessingFeatureSourceDefinition.Flag.FlagCreateIndividualOutputPerInputFeature)
self.assertEqual(c.geometryCheck, QgsFeatureRequest.GeometrySkipInvalid) self.assertEqual(c.geometryCheck, QgsFeatureRequest.GeometrySkipInvalid)
def test_output_layer_definition(self): def test_output_layer_definition(self):