Cleanup python code

qgis · Nov 2, 2019 · abf9880 · abf9880
1 parent 52f0994
commit abf9880
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 74 deletions.
diff --git a/python/core/__init__.py.in b/python/core/__init__.py.in
@@ -26,7 +26,6 @@ from qgis._core import *
 
 from .additions.edit import edit, QgsEditError
 from .additions.fromfunction import fromFunction
-from .additions.markerlinesymbollayer import *
 from .additions.metaenum import metaEnumFromType, metaEnumFromValue
 from .additions.processing import processing_output_layer_repr, processing_source_repr
 from .additions.projectdirtyblocker import ProjectDirtyBlocker
@@ -38,7 +37,6 @@ from .additions.qgssettings import _qgssettings_enum_value, _qgssettings_set_enu
 from .additions.qgstaskwrapper import QgsTaskWrapper
 from .additions.readwritecontextentercategory import ReadWriteContextEnterCategory
 from .additions.validitycheck import check
-from .additions import qgsdataprovider
 
 # Injections into classes
 QgsFeature.__geo_interface__ = property(mapping_feature)
@@ -56,3 +54,26 @@ QgsTask.fromFunction = fromFunction
 
 # Classes patched using a derived class
 QgsProviderMetadata = PyProviderMetadata
+
+# monkey patch deprecated enum values to maintain API
+# TODO - remove for QGIS 4.0
+QgsMarkerLineSymbolLayer.Interval = QgsTemplatedLineSymbolLayerBase.Interval
+QgsMarkerLineSymbolLayer.Vertex = QgsTemplatedLineSymbolLayerBase.Vertex
+QgsMarkerLineSymbolLayer.LastVertex = QgsTemplatedLineSymbolLayerBase.LastVertex
+QgsMarkerLineSymbolLayer.FirstVertex = QgsTemplatedLineSymbolLayerBase.FirstVertex
+QgsMarkerLineSymbolLayer.CentralPoint = QgsTemplatedLineSymbolLayerBase.CentralPoint
+QgsMarkerLineSymbolLayer.CurvePoint = QgsTemplatedLineSymbolLayerBase.CurvePoint
+
+# Monkey patch static const "QgsDataProvider.SUBLAYER_SEPARATOR" which was removed for QGIS 3.12
+QgsDataProvider.SUBLAYER_SEPARATOR = QgsDataProvider.sublayerSeparator()
+
+# Monkey patch Qgis vars
+Qgis.QGIS_VERSION = Qgis.version()
+Qgis.QGIS_VERSION_INT = Qgis.versionInt()
+Qgis.QGIS_VERSION_RELEASE_NAME = Qgis.releaseName()
+
+core.GEOWKT = geoWkt()
+core.PROJECT_SCALES = projectScales()
+core.GEOPROJ4 = geoProj4()
+core.GEO_EPSG_CRS_AUTHID = geoEpsgCrsAuthId()
+core.GEO_NONE = geoNone()
diff --git a/python/core/additions/markerlinesymbollayer.py b/python/core/additions/markerlinesymbollayer.py
diff --git a/python/core/additions/qgis.py b/python/core/additions/qgis.py
diff --git a/python/core/additions/qgsdataprovider.py b/python/core/additions/qgsdataprovider.py