[sipify] Patch support for int based enum operations on non-enum class ints

sip6 converts all enums to python Enums, but ONLY creates
Enums with IntFlags types when the c++ type is an enum class : int.
Accordingly we need to patch back in all the operations which treat
enum values as ints, like |, &, bool, etc.

The long term solution here is to move all our c++ enums to enum
class, but that's not always straightforward and can break API
for plugins if it involves the signature of virtual methods.

Author: nyalldawson

python/PyQt6/analysis/auto_additions/qgszonalstatistics.py

@@ -20,3 +20,10 @@
 QgsZonalStatistics.RasterBandInvalid = QgsZonalStatistics.Result.RasterBandInvalid
 QgsZonalStatistics.FailedToCreateField = QgsZonalStatistics.Result.FailedToCreateField
 QgsZonalStatistics.Canceled = QgsZonalStatistics.Result.Canceled
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsZonalStatistics.Statistic.__bool__ = lambda flag: _force_int(flag)
+QgsZonalStatistics.Statistic.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsZonalStatistics.Statistic.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsZonalStatistics.Statistic.__or__ = lambda flag1, flag2: QgsZonalStatistics.Statistic(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgsabstractdatabaseproviderconnection.py

@@ -55,3 +55,10 @@
 QgsAbstractDatabaseProviderConnection.GeometryColumnCapabilities = lambda flags=0: QgsAbstractDatabaseProviderConnection.GeometryColumnCapability(flags)
 QgsAbstractDatabaseProviderConnection.GeometryColumnCapabilities.baseClass = QgsAbstractDatabaseProviderConnection
 GeometryColumnCapabilities = QgsAbstractDatabaseProviderConnection  # dirty hack since SIP seems to introduce the flags in module
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsAbstractDatabaseProviderConnection.Capability.__bool__ = lambda flag: _force_int(flag)
+QgsAbstractDatabaseProviderConnection.Capability.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsAbstractDatabaseProviderConnection.Capability.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsAbstractDatabaseProviderConnection.Capability.__or__ = lambda flag1, flag2: QgsAbstractDatabaseProviderConnection.Capability(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgsabstractgeometry.py

@@ -7,3 +7,10 @@
 QgsAbstractGeometry.FlagExportTrianglesAsPolygons = QgsAbstractGeometry.WkbFlag.FlagExportTrianglesAsPolygons
 QgsAbstractGeometry.FlagExportNanAsDoubleMin = QgsAbstractGeometry.WkbFlag.FlagExportNanAsDoubleMin
 QgsAbstractGeometry.WkbFlags = lambda flags=0: QgsAbstractGeometry.WkbFlag(flags)
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsAbstractGeometry.WkbFlag.__bool__ = lambda flag: _force_int(flag)
+QgsAbstractGeometry.WkbFlag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsAbstractGeometry.WkbFlag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsAbstractGeometry.WkbFlag.__or__ = lambda flag1, flag2: QgsAbstractGeometry.WkbFlag(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgsattributeeditorrelation.py

@@ -11,3 +11,10 @@
 QgsAttributeEditorRelation.Buttons = lambda flags=0: QgsAttributeEditorRelation.Button(flags)
 QgsAttributeEditorRelation.Buttons.baseClass = QgsAttributeEditorRelation
 Buttons = QgsAttributeEditorRelation  # dirty hack since SIP seems to introduce the flags in module
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsAttributeEditorRelation.Button.__bool__ = lambda flag: _force_int(flag)
+QgsAttributeEditorRelation.Button.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsAttributeEditorRelation.Button.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsAttributeEditorRelation.Button.__or__ = lambda flag1, flag2: QgsAttributeEditorRelation.Button(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgsauthmethod.py

@@ -6,3 +6,10 @@
 QgsAuthMethod.NetworkProxy = QgsAuthMethod.Expansion.NetworkProxy
 QgsAuthMethod.All = QgsAuthMethod.Expansion.All
 QgsAuthMethod.Expansions = lambda flags=0: QgsAuthMethod.Expansion(flags)
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsAuthMethod.Expansion.__bool__ = lambda flag: _force_int(flag)
+QgsAuthMethod.Expansion.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsAuthMethod.Expansion.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsAuthMethod.Expansion.__or__ = lambda flag1, flag2: QgsAuthMethod.Expansion(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgsclassificationmethod.py

@@ -7,3 +7,10 @@
 QgsClassificationMethod.LowerBound = QgsClassificationMethod.ClassPosition.LowerBound
 QgsClassificationMethod.Inner = QgsClassificationMethod.ClassPosition.Inner
 QgsClassificationMethod.UpperBound = QgsClassificationMethod.ClassPosition.UpperBound
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsClassificationMethod.MethodProperty.__bool__ = lambda flag: _force_int(flag)
+QgsClassificationMethod.MethodProperty.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsClassificationMethod.MethodProperty.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsClassificationMethod.MethodProperty.__or__ = lambda flag1, flag2: QgsClassificationMethod.MethodProperty(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgscolorscheme.py

@@ -3,3 +3,10 @@
 QgsColorScheme.ShowInColorButtonMenu = QgsColorScheme.SchemeFlag.ShowInColorButtonMenu
 QgsColorScheme.ShowInAllContexts = QgsColorScheme.SchemeFlag.ShowInAllContexts
 QgsColorScheme.SchemeFlags = lambda flags=0: QgsColorScheme.SchemeFlag(flags)
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsColorScheme.SchemeFlag.__bool__ = lambda flag: _force_int(flag)
+QgsColorScheme.SchemeFlag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsColorScheme.SchemeFlag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsColorScheme.SchemeFlag.__or__ = lambda flag1, flag2: QgsColorScheme.SchemeFlag(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgscoordinateformatter.py

@@ -6,3 +6,10 @@
 QgsCoordinateFormatter.FlagDegreesUseStringSuffix = QgsCoordinateFormatter.FormatFlag.FlagDegreesUseStringSuffix
 QgsCoordinateFormatter.FlagDegreesPadMinutesSeconds = QgsCoordinateFormatter.FormatFlag.FlagDegreesPadMinutesSeconds
 QgsCoordinateFormatter.FormatFlags = lambda flags=0: QgsCoordinateFormatter.FormatFlag(flags)
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsCoordinateFormatter.FormatFlag.__bool__ = lambda flag: _force_int(flag)
+QgsCoordinateFormatter.FormatFlag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsCoordinateFormatter.FormatFlag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsCoordinateFormatter.FormatFlag.__or__ = lambda flag1, flag2: QgsCoordinateFormatter.FormatFlag(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgsdataprovider.py

@@ -16,3 +16,10 @@
 QgsDataProvider.SkipCredentialsRequest = QgsDataProvider.ReadFlag.SkipCredentialsRequest
 QgsDataProvider.ParallelThreadLoading = QgsDataProvider.ReadFlag.ParallelThreadLoading
 QgsDataProvider.ReadFlags = lambda flags=0: QgsDataProvider.ReadFlag(flags)
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsDataProvider.ReadFlag.__bool__ = lambda flag: _force_int(flag)
+QgsDataProvider.ReadFlag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsDataProvider.ReadFlag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsDataProvider.ReadFlag.__or__ = lambda flag1, flag2: QgsDataProvider.ReadFlag(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgsdatetimestatisticalsummary.py

@@ -7,3 +7,10 @@
 QgsDateTimeStatisticalSummary.Range = QgsDateTimeStatisticalSummary.Statistic.Range
 QgsDateTimeStatisticalSummary.All = QgsDateTimeStatisticalSummary.Statistic.All
 QgsDateTimeStatisticalSummary.Statistics = lambda flags=0: QgsDateTimeStatisticalSummary.Statistic(flags)
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsDateTimeStatisticalSummary.Statistic.__bool__ = lambda flag: _force_int(flag)
+QgsDateTimeStatisticalSummary.Statistic.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsDateTimeStatisticalSummary.Statistic.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsDateTimeStatisticalSummary.Statistic.__or__ = lambda flag1, flag2: QgsDateTimeStatisticalSummary.Statistic(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgsdxfexport.py

@@ -35,3 +35,17 @@
 QgsDxfExport.PolyfaceMesh = QgsDxfExport.DxfPolylineFlag.PolyfaceMesh
 QgsDxfExport.ContinuousPattern = QgsDxfExport.DxfPolylineFlag.ContinuousPattern
 QgsDxfExport.DxfPolylineFlags = lambda flags=0: QgsDxfExport.DxfPolylineFlag(flags)
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsDxfExport.Flag.__bool__ = lambda flag: _force_int(flag)
+QgsDxfExport.Flag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsDxfExport.Flag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsDxfExport.Flag.__or__ = lambda flag1, flag2: QgsDxfExport.Flag(_force_int(flag1) | _force_int(flag2))
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsDxfExport.DxfPolylineFlag.__bool__ = lambda flag: _force_int(flag)
+QgsDxfExport.DxfPolylineFlag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsDxfExport.DxfPolylineFlag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsDxfExport.DxfPolylineFlag.__or__ = lambda flag1, flag2: QgsDxfExport.DxfPolylineFlag(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgsfeaturerequest.py

@@ -13,3 +13,10 @@
 QgsFeatureRequest.GeometryNoCheck = QgsFeatureRequest.InvalidGeometryCheck.GeometryNoCheck
 QgsFeatureRequest.GeometrySkipInvalid = QgsFeatureRequest.InvalidGeometryCheck.GeometrySkipInvalid
 QgsFeatureRequest.GeometryAbortOnInvalid = QgsFeatureRequest.InvalidGeometryCheck.GeometryAbortOnInvalid
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsFeatureRequest.Flag.__bool__ = lambda flag: _force_int(flag)
+QgsFeatureRequest.Flag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsFeatureRequest.Flag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsFeatureRequest.Flag.__or__ = lambda flag1, flag2: QgsFeatureRequest.Flag(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgsfeaturesink.py

@@ -4,3 +4,10 @@
 QgsFeatureSink.FastInsert = QgsFeatureSink.Flag.FastInsert
 QgsFeatureSink.RollBackOnErrors = QgsFeatureSink.Flag.RollBackOnErrors
 QgsFeatureSink.Flags = lambda flags=0: QgsFeatureSink.Flag(flags)
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsFeatureSink.Flag.__bool__ = lambda flag: _force_int(flag)
+QgsFeatureSink.Flag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsFeatureSink.Flag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsFeatureSink.Flag.__or__ = lambda flag1, flag2: QgsFeatureSink.Flag(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgsfieldconstraints.py

@@ -9,3 +9,10 @@
 QgsFieldConstraints.ConstraintStrengthNotSet = QgsFieldConstraints.ConstraintStrength.ConstraintStrengthNotSet
 QgsFieldConstraints.ConstraintStrengthHard = QgsFieldConstraints.ConstraintStrength.ConstraintStrengthHard
 QgsFieldConstraints.ConstraintStrengthSoft = QgsFieldConstraints.ConstraintStrength.ConstraintStrengthSoft
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsFieldConstraints.Constraint.__bool__ = lambda flag: _force_int(flag)
+QgsFieldConstraints.Constraint.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsFieldConstraints.Constraint.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsFieldConstraints.Constraint.__or__ = lambda flag1, flag2: QgsFieldConstraints.Constraint(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgsfieldproxymodel.py

@@ -14,3 +14,10 @@
 QgsFieldProxyModel.Filters = lambda flags=0: QgsFieldProxyModel.Filter(flags)
 QgsFieldProxyModel.Filters.baseClass = QgsFieldProxyModel
 Filters = QgsFieldProxyModel  # dirty hack since SIP seems to introduce the flags in module
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsFieldProxyModel.Filter.__bool__ = lambda flag: _force_int(flag)
+QgsFieldProxyModel.Filter.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsFieldProxyModel.Filter.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsFieldProxyModel.Filter.__or__ = lambda flag1, flag2: QgsFieldProxyModel.Filter(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgslayertreemodel.py

@@ -11,3 +11,10 @@
 QgsLayerTreeModel.ActionHierarchical = QgsLayerTreeModel.Flag.ActionHierarchical
 QgsLayerTreeModel.UseThreadedHitTest = QgsLayerTreeModel.Flag.UseThreadedHitTest
 QgsLayerTreeModel.Flags = lambda flags=0: QgsLayerTreeModel.Flag(flags)
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsLayerTreeModel.Flag.__bool__ = lambda flag: _force_int(flag)
+QgsLayerTreeModel.Flag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsLayerTreeModel.Flag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsLayerTreeModel.Flag.__or__ = lambda flag1, flag2: QgsLayerTreeModel.Flag(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgslayoutitem.py

@@ -116,3 +116,10 @@
 QgsLayoutItem.CanGroupWithItemsOfSameType = QgsLayoutItem.ExportLayerBehavior.CanGroupWithItemsOfSameType
 QgsLayoutItem.MustPlaceInOwnLayer = QgsLayoutItem.ExportLayerBehavior.MustPlaceInOwnLayer
 QgsLayoutItem.ItemContainsSubLayers = QgsLayoutItem.ExportLayerBehavior.ItemContainsSubLayers
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsLayoutItem.Flag.__bool__ = lambda flag: _force_int(flag)
+QgsLayoutItem.Flag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsLayoutItem.Flag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsLayoutItem.Flag.__or__ = lambda flag1, flag2: QgsLayoutItem.Flag(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgslayoutitemmap.py

@@ -5,3 +5,10 @@
 QgsLayoutItemMap.ShowPartialLabels = QgsLayoutItemMap.MapItemFlag.ShowPartialLabels
 QgsLayoutItemMap.ShowUnplacedLabels = QgsLayoutItemMap.MapItemFlag.ShowUnplacedLabels
 QgsLayoutItemMap.MapItemFlags = lambda flags=0: QgsLayoutItemMap.MapItemFlag(flags)
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsLayoutItemMap.MapItemFlag.__bool__ = lambda flag: _force_int(flag)
+QgsLayoutItemMap.MapItemFlag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsLayoutItemMap.MapItemFlag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsLayoutItemMap.MapItemFlag.__or__ = lambda flag1, flag2: QgsLayoutItemMap.MapItemFlag(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgslayoutitemmapgrid.py

@@ -50,3 +50,10 @@
 QgsLayoutItemMapGrid.FrameSideFlags = lambda flags=0: QgsLayoutItemMapGrid.FrameSideFlag(flags)
 QgsLayoutItemMapGrid.Longitude = QgsLayoutItemMapGrid.AnnotationCoordinate.Longitude
 QgsLayoutItemMapGrid.Latitude = QgsLayoutItemMapGrid.AnnotationCoordinate.Latitude
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsLayoutItemMapGrid.FrameSideFlag.__bool__ = lambda flag: _force_int(flag)
+QgsLayoutItemMapGrid.FrameSideFlag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsLayoutItemMapGrid.FrameSideFlag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsLayoutItemMapGrid.FrameSideFlag.__or__ = lambda flag1, flag2: QgsLayoutItemMapGrid.FrameSideFlag(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgslayoutmanager.py

@@ -5,3 +5,10 @@
 QgsLayoutManagerProxyModel.Filters = lambda flags=0: QgsLayoutManagerProxyModel.Filter(flags)
 QgsLayoutManagerProxyModel.Filters.baseClass = QgsLayoutManagerProxyModel
 Filters = QgsLayoutManagerProxyModel  # dirty hack since SIP seems to introduce the flags in module
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsLayoutManagerProxyModel.Filter.__bool__ = lambda flag: _force_int(flag)
+QgsLayoutManagerProxyModel.Filter.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsLayoutManagerProxyModel.Filter.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsLayoutManagerProxyModel.Filter.__or__ = lambda flag1, flag2: QgsLayoutManagerProxyModel.Filter(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgslocatorfilter.py

@@ -9,3 +9,10 @@
 QgsLocatorFilter.Flags = lambda flags=0: QgsLocatorFilter.Flag(flags)
 QgsLocatorFilter.Flags.baseClass = QgsLocatorFilter
 Flags = QgsLocatorFilter  # dirty hack since SIP seems to introduce the flags in module
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsLocatorFilter.Flag.__bool__ = lambda flag: _force_int(flag)
+QgsLocatorFilter.Flag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsLocatorFilter.Flag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsLocatorFilter.Flag.__or__ = lambda flag1, flag2: QgsLocatorFilter.Flag(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgsmaplayer.py

@@ -37,3 +37,24 @@
 QgsMapLayer.FlagReadExtentFromXml = QgsMapLayer.ReadFlag.FlagReadExtentFromXml
 QgsMapLayer.FlagForceReadOnly = QgsMapLayer.ReadFlag.FlagForceReadOnly
 QgsMapLayer.ReadFlags = lambda flags=0: QgsMapLayer.ReadFlag(flags)
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsMapLayer.LayerFlag.__bool__ = lambda flag: _force_int(flag)
+QgsMapLayer.LayerFlag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsMapLayer.LayerFlag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsMapLayer.LayerFlag.__or__ = lambda flag1, flag2: QgsMapLayer.LayerFlag(_force_int(flag1) | _force_int(flag2))
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsMapLayer.StyleCategory.__bool__ = lambda flag: _force_int(flag)
+QgsMapLayer.StyleCategory.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsMapLayer.StyleCategory.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsMapLayer.StyleCategory.__or__ = lambda flag1, flag2: QgsMapLayer.StyleCategory(_force_int(flag1) | _force_int(flag2))
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsMapLayer.ReadFlag.__bool__ = lambda flag: _force_int(flag)
+QgsMapLayer.ReadFlag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsMapLayer.ReadFlag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsMapLayer.ReadFlag.__or__ = lambda flag1, flag2: QgsMapLayer.ReadFlag(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgspointcloudattributemodel.py

@@ -15,3 +15,10 @@
 QgsPointCloudAttributeProxyModel.Filters = lambda flags=0: QgsPointCloudAttributeProxyModel.Filter(flags)
 QgsPointCloudAttributeProxyModel.Filters.baseClass = QgsPointCloudAttributeProxyModel
 Filters = QgsPointCloudAttributeProxyModel  # dirty hack since SIP seems to introduce the flags in module
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsPointCloudAttributeProxyModel.Filter.__bool__ = lambda flag: _force_int(flag)
+QgsPointCloudAttributeProxyModel.Filter.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsPointCloudAttributeProxyModel.Filter.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsPointCloudAttributeProxyModel.Filter.__or__ = lambda flag1, flag2: QgsPointCloudAttributeProxyModel.Filter(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgsprocessingalgorithm.py

@@ -17,3 +17,10 @@
 QgsProcessingAlgorithm.Flags = lambda flags=0: QgsProcessingAlgorithm.Flag(flags)
 QgsProcessingAlgorithm.NotAvailable = QgsProcessingAlgorithm.PropertyAvailability.NotAvailable
 QgsProcessingAlgorithm.Available = QgsProcessingAlgorithm.PropertyAvailability.Available
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsProcessingAlgorithm.Flag.__bool__ = lambda flag: _force_int(flag)
+QgsProcessingAlgorithm.Flag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsProcessingAlgorithm.Flag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsProcessingAlgorithm.Flag.__or__ = lambda flag1, flag2: QgsProcessingAlgorithm.Flag(_force_int(flag1) | _force_int(flag2))

python/PyQt6/core/auto_additions/qgsprocessingcontext.py

@@ -9,3 +9,10 @@
 QgsProcessingContext.ProcessArgumentFlag.__doc__ = "Flags controlling the results given by :py:func:`~QgsProcessingContext.asQgisProcessArguments`.\n\n.. versionadded:: 3.24\n\n" + '* ``IncludeProjectPath``: ' + QgsProcessingContext.ProcessArgumentFlag.IncludeProjectPath.__doc__
 # --
 QgsProcessingContext.ProcessArgumentFlags = lambda flags=0: QgsProcessingContext.ProcessArgumentFlag(flags)
+_force_int = lambda v: v if isinstance(v, int) else int(v.value)
+
+
+QgsProcessingContext.Flag.__bool__ = lambda flag: _force_int(flag)
+QgsProcessingContext.Flag.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
+QgsProcessingContext.Flag.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
+QgsProcessingContext.Flag.__or__ = lambda flag1, flag2: QgsProcessingContext.Flag(_force_int(flag1) | _force_int(flag2))