Followup 8d51a693, fix broken plugins

python/plugins/db_manager/db_manager.py

@@ -29,7 +29,12 @@ from qgis.PyQt.QtWidgets import QMainWindow, QApplication, QMenu, QTabWidget, QG
 from qgis.PyQt.QtGui import QIcon, QKeySequence
 
 from qgis.gui import QgsMessageBar
-from qgis.core import Qgis, QgsApplication, QgsSettings, QgsMapLayer
+from qgis.core import (
+    Qgis,
+    QgsApplication,
+    QgsSettings,
+    QgsMapLayerType
+)
 from qgis.utils import OverrideCursor
 
 from .info_viewer import InfoViewer

python/plugins/db_manager/db_manager_plugin.py

@@ -25,7 +25,12 @@ from qgis.PyQt.QtCore import Qt
 from qgis.PyQt.QtWidgets import QAction, QApplication
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QgsProject, QgsMapLayer, QgsDataSourceUri, QgsApplication
+from qgis.core import (
+    QgsProject,
+    QgsMapLayerType,
+    QgsDataSourceUri,
+    QgsApplication
+)
 
 from . import resources_rc  # NOQA
 

python/plugins/db_manager/db_plugins/plugin.py

@@ -27,7 +27,12 @@ from qgis.PyQt.QtWidgets import QApplication, QAction, QMenu, QInputDialog, QMes
 from qgis.PyQt.QtGui import QKeySequence, QIcon
 
 from qgis.gui import QgsMessageBar
-from qgis.core import Qgis, QgsApplication, QgsSettings
+from qgis.core import (
+    Qgis,
+    QgsApplication,
+    QgsSettings,
+    QgsMapLayerType
+)
 from ..db_plugins import createDbPlugin
 
 

python/plugins/db_manager/db_plugins/vlayers/connector.py

@@ -24,7 +24,15 @@ from qgis.PyQt.QtCore import QUrl, QTemporaryFile
 from ..connector import DBConnector
 from ..plugin import Table
 
-from qgis.core import QgsDataSourceUri, QgsVirtualLayerDefinition, QgsProject, QgsMapLayer, QgsVectorLayer, QgsCoordinateReferenceSystem, QgsWkbTypes
+from qgis.core import (
+    QgsDataSourceUri,
+    QgsVirtualLayerDefinition,
+    QgsProject,
+    QgsMapLayerType,
+    QgsVectorLayer,
+    QgsCoordinateReferenceSystem,
+    QgsWkbTypes
+)
 
 import sqlite3
 

python/plugins/db_manager/dlg_import_vector.py

@@ -29,7 +29,7 @@ from qgis.PyQt.QtWidgets import QDialog, QFileDialog, QMessageBox
 
 from qgis.core import (QgsDataSourceUri,
                        QgsVectorLayer,
-                       QgsMapLayer,
+                       QgsMapLayerType,
                        QgsProviderRegistry,
                        QgsCoordinateReferenceSystem,
                        QgsVectorLayerExporter,

python/plugins/db_manager/dlg_sql_layer_window.py

@@ -32,7 +32,12 @@ from qgis.PyQt.QtGui import QKeySequence, QCursor, QClipboard, QIcon, QStandardI
 from qgis.PyQt.Qsci import QsciAPIs
 from qgis.PyQt.QtXml import QDomDocument
 
-from qgis.core import QgsProject, QgsDataSourceUri, QgsReadWriteContext
+from qgis.core import (
+    QgsProject,
+    QgsDataSourceUri,
+    QgsReadWriteContext,
+    QgsMapLayerType
+)
 from qgis.utils import OverrideCursor
 
 from .db_plugins import createDbPlugin

python/plugins/db_manager/dlg_sql_window.py

@@ -33,7 +33,13 @@ from qgis.PyQt.QtWidgets import QDialog, QWidget, QAction, QApplication, QInputD
 from qgis.PyQt.QtGui import QKeySequence, QCursor, QClipboard, QIcon, QStandardItemModel, QStandardItem
 from qgis.PyQt.Qsci import QsciAPIs
 
-from qgis.core import QgsProject, QgsApplication, QgsTask, QgsSettings
+from qgis.core import (
+    QgsProject,
+    QgsApplication,
+    QgsTask,
+    QgsSettings,
+    QgsMapLayerType
+)
 from qgis.utils import OverrideCursor
 
 from .db_plugins.plugin import BaseError

python/plugins/processing/ProcessingPlugin.py

@@ -36,7 +36,7 @@ from qgis.core import (QgsApplication,
                        QgsDataItemProvider,
                        QgsDataProvider,
                        QgsDataItem,
-                       QgsMapLayer,
+                       QgsMapLayerType,
                        QgsMimeDataUtils)
 from qgis.gui import (QgsOptionsWidgetFactory,
                       QgsCustomDropHandler)

python/plugins/processing/algs/grass7/Grass7Algorithm.py

@@ -36,7 +36,7 @@ from qgis.PyQt.QtCore import QCoreApplication, QUrl
 from qgis.core import (Qgis,
                        QgsRasterLayer,
                        QgsApplication,
-                       QgsMapLayer,
+                       QgsMapLayerType,
                        QgsProcessingUtils,
                        QgsProcessing,
                        QgsMessageLog,

python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py

@@ -41,7 +41,7 @@ from qgis.core import (Qgis,
                        QgsProperty,
                        QgsProject,
                        QgsMessageLog,
-                       QgsMapLayer,
+                       QgsMapLayerType,
                        QgsProcessingOutputLayerDefinition)
 from qgis.gui import QgsEncodingFileDialog, QgsGui
 from qgis.utils import OverrideCursor, iface

python/plugins/processing/gui/AlgorithmLocatorFilter.py

@@ -33,7 +33,7 @@ from qgis.core import (QgsApplication,
                        QgsLocatorResult,
                        QgsProcessing,
                        QgsWkbTypes,
-                       QgsMapLayer,
+                       QgsMapLayerType,
                        QgsFields)
 from processing.gui.MessageBarProgress import MessageBarProgress
 from processing.gui.MessageDialog import MessageDialog

python/plugins/processing/gui/Postprocessing.py

@@ -34,7 +34,7 @@ from qgis.core import (Qgis,
                        QgsProject,
                        QgsProcessingFeedback,
                        QgsProcessingUtils,
-                       QgsMapLayer,
+                       QgsMapLayerType,
                        QgsWkbTypes,
                        QgsMessageLog,
                        QgsProviderRegistry,

python/plugins/processing/gui/ProcessingToolbox.py

@@ -34,7 +34,7 @@ from qgis.PyQt.QtCore import Qt, QCoreApplication
 from qgis.PyQt.QtWidgets import QToolButton, QMenu, QAction
 from qgis.utils import iface
 from qgis.core import (QgsWkbTypes,
-                       QgsMapLayer,
+                       QgsMapLayerType,
                        QgsApplication,
                        QgsProcessingAlgorithm)
 from qgis.gui import (QgsGui,

python/plugins/processing/gui/wrappers.py

@@ -44,7 +44,7 @@ from qgis.core import (
     QgsWkbTypes,
     QgsSettings,
     QgsProject,
-    QgsMapLayer,
+    QgsMapLayerType,
     QgsVectorLayer,
     QgsProcessing,
     QgsProcessingUtils,