fix sipify and run

qgis · Jun 3, 2018 · 164f662 · 164f662
1 parent 1fb02e8
commit 164f662
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 57 deletions.
diff --git a/python/core/__init__.py.in b/python/core/__init__.py.in
@@ -50,37 +50,3 @@ QgsReadWriteContext.enterCategory = ReadWriteContextEnterCategory
 QgsSettings.enumValue = _qgssettings_enum_value
 QgsSettings.flagValue = _qgssettings_flag_value
 QgsTask.fromFunction = fromFunction
-
-# -----------------
-# DO NOT EDIT BELOW
-# These are automatically added by calling sipify.pl script
-
-QgsAuthManager.MessageLevel.baseClass = QgsAuthManager
-QgsDataItem.Type.baseClass = QgsDataItem
-QgsDataItem.State.baseClass = QgsDataItem
-QgsLayerItem.LayerType.baseClass = QgsLayerItem
-QgsDataProvider.DataCapability.baseClass = QgsDataProvider
-QgsDataSourceUri.SslMode.baseClass = QgsDataSourceUri
-QgsFieldProxyModel.Filters.baseClass = QgsFieldProxyModel
-Filters = QgsFieldProxyModel  # dirty hack since SIP seems to introduce the flags in module
-QgsMapLayerProxyModel.Filters.baseClass = QgsMapLayerProxyModel
-Filters = QgsMapLayerProxyModel  # dirty hack since SIP seems to introduce the flags in module
-QgsNetworkContentFetcherRegistry.FetchingMode.baseClass = QgsNetworkContentFetcherRegistry
-QgsSnappingConfig.SnappingMode.baseClass = QgsSnappingConfig
-QgsSnappingConfig.SnappingType.baseClass = QgsSnappingConfig
-QgsTolerance.UnitType.baseClass = QgsTolerance
-QgsUnitTypes.DistanceUnit.baseClass = QgsUnitTypes
-QgsUnitTypes.AreaUnit.baseClass = QgsUnitTypes
-QgsUnitTypes.AngleUnit.baseClass = QgsUnitTypes
-QgsUnitTypes.RenderUnit.baseClass = QgsUnitTypes
-QgsUnitTypes.LayoutUnit.baseClass = QgsUnitTypes
-QgsVectorSimplifyMethod.SimplifyHint.baseClass = QgsVectorSimplifyMethod
-QgsVectorSimplifyMethod.SimplifyHints.baseClass = QgsVectorSimplifyMethod
-SimplifyHints = QgsVectorSimplifyMethod  # dirty hack since SIP seems to introduce the flags in module
-QgsVectorSimplifyMethod.SimplifyAlgorithm.baseClass = QgsVectorSimplifyMethod
-QgsRasterProjector.Precision.baseClass = QgsRasterProjector
-QgsAbstractGeometry.SegmentationToleranceType.baseClass = QgsAbstractGeometry
-QgsGeometry.BufferSide.baseClass = QgsGeometry
-QgsGeometry.EndCapStyle.baseClass = QgsGeometry
-QgsGeometry.JoinStyle.baseClass = QgsGeometry
-QgsDefaultValue.__bool__ = lambda self: self.isValid()
diff --git a/python/core/auto_additions/qgsabstractgeometry.py b/python/core/auto_additions/qgsabstractgeometry.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/geometry/qgsabstractgeometry.h
+QgsAbstractGeometry.SegmentationToleranceType.baseClass = QgsAbstractGeometry
diff --git a/python/core/auto_additions/qgsauthmanager.py b/python/core/auto_additions/qgsauthmanager.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/auth/qgsauthmanager.h
+QgsAuthManager.MessageLevel.baseClass = QgsAuthManager
diff --git a/python/core/auto_additions/qgsdataprovider.py b/python/core/auto_additions/qgsdataprovider.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/qgsdataprovider.h
+QgsDataProvider.DataCapability.baseClass = QgsDataProvider
diff --git a/python/core/auto_additions/qgsdatasourceuri.py b/python/core/auto_additions/qgsdatasourceuri.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/qgsdatasourceuri.h
+QgsDataSourceUri.SslMode.baseClass = QgsDataSourceUri
diff --git a/python/core/auto_additions/qgsdefaultvalue.py b/python/core/auto_additions/qgsdefaultvalue.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/qgsdefaultvalue.h
+QgsDefaultValue.__bool__ = lambda self: self.isValid()
diff --git a/python/core/auto_additions/qgsnetworkcontentfetcherregistry.py b/python/core/auto_additions/qgsnetworkcontentfetcherregistry.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/qgsnetworkcontentfetcherregistry.h
+QgsNetworkContentFetcherRegistry.FetchingMode.baseClass = QgsNetworkContentFetcherRegistry
diff --git a/python/core/auto_additions/qgsrasterprojector.py b/python/core/auto_additions/qgsrasterprojector.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/raster/qgsrasterprojector.h
+QgsRasterProjector.Precision.baseClass = QgsRasterProjector
diff --git a/python/core/auto_additions/qgstolerance.py b/python/core/auto_additions/qgstolerance.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/qgstolerance.h
+QgsTolerance.UnitType.baseClass = QgsTolerance
diff --git a/python/gui/__init__.py.in b/python/gui/__init__.py.in
@@ -25,25 +25,3 @@ __revision__ = '$Format:%H$'
 
 from qgis.PyQt import QtCore
 from qgis._gui import *
-
-# -----------------
-# DO NOT EDIT BELOW
-# These are automatically added by calling sipify.pl script
-QgsAuthSettingsWidget.WarningType.baseClass = QgsAuthSettingsWidget
-QgsAdvancedDigitizingDockWidget.CadCapacities.baseClass = QgsAdvancedDigitizingDockWidget
-CadCapacities = QgsAdvancedDigitizingDockWidget  # dirty hack since SIP seems to introduce the flags in module
-QgsColorButton.Behavior.baseClass = QgsColorButton
-QgsColorTextWidget.ColorTextFormat.baseClass = QgsColorTextWidget
-QgsFilterLineEdit.ClearMode.baseClass = QgsFilterLineEdit
-QgsFloatingWidget.AnchorPoint.baseClass = QgsFloatingWidget
-QgsFontButton.Mode.baseClass = QgsFontButton
-QgsMapLayerAction.Targets.baseClass = QgsMapLayerAction
-Targets = QgsMapLayerAction  # dirty hack since SIP seems to introduce the flags in module
-QgsMapLayerAction.Flags.baseClass = QgsMapLayerAction
-Flags = QgsMapLayerAction  # dirty hack since SIP seems to introduce the flags in module
-QgsMapToolIdentify.IdentifyMode.baseClass = QgsMapToolIdentify
-QgsMapToolIdentify.LayerType.baseClass = QgsMapToolIdentify
-LayerType = QgsMapToolIdentify  # dirty hack since SIP seems to introduce the flags in module
-QgsAttributeTableFilterModel.FilterMode.baseClass = QgsAttributeTableFilterModel
-QgsAttributeTableFilterModel.ColumnType.baseClass = QgsAttributeTableFilterModel
-QgsDualView.ViewMode.baseClass = QgsDualView
diff --git a/python/gui/auto_additions/qgsauthsettingswidget.py b/python/gui/auto_additions/qgsauthsettingswidget.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/gui/auth/qgsauthsettingswidget.h
+QgsAuthSettingsWidget.WarningType.baseClass = QgsAuthSettingsWidget
diff --git a/python/gui/auto_additions/qgscolorbutton.py b/python/gui/auto_additions/qgscolorbutton.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/gui/qgscolorbutton.h
+QgsColorButton.Behavior.baseClass = QgsColorButton
diff --git a/python/gui/auto_additions/qgscolorwidgets.py b/python/gui/auto_additions/qgscolorwidgets.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/gui/qgscolorwidgets.h
+QgsColorTextWidget.ColorTextFormat.baseClass = QgsColorTextWidget
diff --git a/python/gui/auto_additions/qgsdualview.py b/python/gui/auto_additions/qgsdualview.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/gui/attributetable/qgsdualview.h
+QgsDualView.ViewMode.baseClass = QgsDualView
diff --git a/python/gui/auto_additions/qgsfilterlineedit.py b/python/gui/auto_additions/qgsfilterlineedit.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/gui/qgsfilterlineedit.h
+QgsFilterLineEdit.ClearMode.baseClass = QgsFilterLineEdit
diff --git a/python/gui/auto_additions/qgsfloatingwidget.py b/python/gui/auto_additions/qgsfloatingwidget.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/gui/qgsfloatingwidget.h
+QgsFloatingWidget.AnchorPoint.baseClass = QgsFloatingWidget
diff --git a/python/gui/auto_additions/qgsfontbutton.py b/python/gui/auto_additions/qgsfontbutton.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/gui/qgsfontbutton.h
+QgsFontButton.Mode.baseClass = QgsFontButton
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -1194,7 +1194,7 @@ sub detect_non_method_member{
 
 if ( $python_output ne '' ){
     unlink $python_output or 1;
-    if ( $#OUTPUT_PYTHON > 0 ){
+    if ( @OUTPUT_PYTHON ){
         open(FH2, '>', $python_output) or die $!;
         print FH2 join('', python_header());
         print FH2 join('', @OUTPUT_PYTHON);