Fix qgis.PyQt compatibility imports

2025-12-15 00:07:25 -05:00 · 2016-04-29 11:39:26 +02:00 · 2016-04-29 11:39:26 +02:00 · abfd7740bd
commit abfd7740bd
parent 8071acd064
50 changed files with 66 additions and 66 deletions
--- a/python/init.py
+++ b/python/init.py
@ -23,7 +23,7 @@ __copyright__ = '(C) 2007, Martin Dobias'
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'

-from PyQt import QtCore
+from qgis.PyQt import QtCore
 from qgis.core import QgsFeature, QgsGeometry


--- a/python/analysis/init.py
+++ b/python/analysis/init.py
@ -23,6 +23,6 @@ __copyright__ = '(C) 2014, Nathan Woodrow'
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'

-from PyQt import QtCore
+from qgis.PyQt import QtCore

 from qgis._analysis import *
--- a/python/networkanalysis/init.py
+++ b/python/networkanalysis/init.py
@ -23,6 +23,6 @@ __copyright__ = '(C) 2014, Nathan Woodrow'
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'

-from PyQt import QtCore
+from qgis.PyQt import QtCore

 from qgis._networkanalysis import *
--- a/python/plugins/processing/algs/lidar/lastools/LAStoolsAlgorithm.py
+++ b/python/plugins/processing/algs/lidar/lastools/LAStoolsAlgorithm.py
@ -28,7 +28,7 @@ __copyright__ = '(C) 2012, Victor Olaya'
 __revision__ = '$Format:%H$'

 import os
-from PyQt import QtGui
+from qgis.PyQt import QtGui
 from processing.core.GeoAlgorithm import GeoAlgorithm

 from .LAStoolsUtils import LAStoolsUtils
--- a/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py
+++ b/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py
@ -28,7 +28,7 @@ __revision__ = '$Format:%H$'
 import os
 import re

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import Qt, QSettings
 from qgis.PyQt.QtWidgets import QDialog, QFileDialog, QApplication, QMessageBox
 from qgis.PyQt.QtGui import QCursor
--- a/python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py
+++ b/python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py
@ -29,7 +29,7 @@ import os

 from collections import OrderedDict

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtGui import QBrush, QIcon
 from qgis.PyQt.QtWidgets import QComboBox, QHeaderView, QLineEdit, QMessageBox, QSpinBox, QStyledItemDelegate
 from qgis.PyQt.QtCore import QItemSelectionModel
--- a/python/plugins/processing/core/ProcessingConfig.py
+++ b/python/plugins/processing/core/ProcessingConfig.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from qgis.PyQt.QtCore import QPyNullVariant, QCoreApplication, QSettings
+from qgis.PyQt.QtCore import QPyNullVariant, QCoreApplication, QSettings, QObject, pyqtSignal
 from qgis.PyQt.QtGui import QIcon
 from processing.tools.system import defaultOutputFolder
 import processing.tools.dataobjects
--- a/python/plugins/processing/gui/AlgorithmDialogBase.py
+++ b/python/plugins/processing/gui/AlgorithmDialogBase.py
@ -28,7 +28,7 @@ __revision__ = '$Format:%H$'
 import os
 import webbrowser

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import QCoreApplication, QSettings, QByteArray, QUrl
 from qgis.PyQt.QtWidgets import QApplication, QDialogButtonBox, QDesktopWidget

--- a/python/plugins/processing/gui/AutofillDialog.py
+++ b/python/plugins/processing/gui/AutofillDialog.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtWidgets import QDialog

 pluginPath = os.path.split(os.path.dirname(__file__))[0]
--- a/python/plugins/processing/gui/BatchPanel.py
+++ b/python/plugins/processing/gui/BatchPanel.py
@ -28,7 +28,7 @@ __revision__ = '$Format:%H$'
 import os
 import json

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QTableWidgetItem, QComboBox, QLineEdit, QHeaderView, QFileDialog, QMessageBox

--- a/python/plugins/processing/gui/ConfigDialog.py
+++ b/python/plugins/processing/gui/ConfigDialog.py
@ -27,23 +27,23 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import (Qt,
-                         QEvent,
-                         QPyNullVariant)
+                              QEvent,
+                              QPyNullVariant)
 from qgis.PyQt.QtWidgets import (QFileDialog,
-                            QDialog,
-                            QStyle,
-                            QMessageBox,
-                            QStyledItemDelegate,
-                            QLineEdit,
-                            QWidget,
-                            QToolButton,
-                            QHBoxLayout,
-                            QComboBox)
+                                 QDialog,
+                                 QStyle,
+                                 QMessageBox,
+                                 QStyledItemDelegate,
+                                 QLineEdit,
+                                 QWidget,
+                                 QToolButton,
+                                 QHBoxLayout,
+                                 QComboBox)
 from qgis.PyQt.QtGui import (QIcon,
-                        QStandardItemModel,
-                        QStandardItem)
+                             QStandardItemModel,
+                             QStandardItem)

 from qgis.gui import QgsDoubleSpinBox
 from qgis.gui import QgsSpinBox
--- a/python/plugins/processing/gui/CrsSelectionPanel.py
+++ b/python/plugins/processing/gui/CrsSelectionPanel.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic

 from qgis.core import QgsCoordinateReferenceSystem
 from qgis.gui import QgsGenericProjectionSelector
--- a/python/plugins/processing/gui/EditRenderingStylesDialog.py
+++ b/python/plugins/processing/gui/EditRenderingStylesDialog.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import Qt
 from qgis.PyQt.QtWidgets import QDialog, QHeaderView, QTableWidgetItem

--- a/python/plugins/processing/gui/ExtentSelectionPanel.py
+++ b/python/plugins/processing/gui/ExtentSelectionPanel.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtWidgets import QMenu, QAction, QInputDialog
 from qgis.PyQt.QtGui import QCursor

--- a/python/plugins/processing/gui/FileSelectionPanel.py
+++ b/python/plugins/processing/gui/FileSelectionPanel.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtWidgets import QFileDialog
 from qgis.PyQt.QtCore import QSettings

--- a/python/plugins/processing/gui/FixedTableDialog.py
+++ b/python/plugins/processing/gui/FixedTableDialog.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtWidgets import QDialog, QPushButton, QAbstractItemView, QDialogButtonBox
 from qgis.PyQt.QtGui import QStandardItemModel, QStandardItem

--- a/python/plugins/processing/gui/FixedTablePanel.py
+++ b/python/plugins/processing/gui/FixedTablePanel.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic

 from processing.gui.FixedTableDialog import FixedTableDialog

--- a/python/plugins/processing/gui/GeometryPredicateSelectionPanel.py
+++ b/python/plugins/processing/gui/GeometryPredicateSelectionPanel.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtWidgets import QCheckBox
 from qgis.core import QGis, QgsVectorLayer

--- a/python/plugins/processing/gui/GetScriptsAndModels.py
+++ b/python/plugins/processing/gui/GetScriptsAndModels.py
@ -30,7 +30,7 @@ import os
 import json
 from functools import partial

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import Qt, QCoreApplication, QUrl
 from qgis.PyQt.QtGui import QIcon, QCursor
 from qgis.PyQt.QtWidgets import QApplication, QTreeWidgetItem, QPushButton
--- a/python/plugins/processing/gui/HelpEditionDialog.py
+++ b/python/plugins/processing/gui/HelpEditionDialog.py
@ -30,7 +30,7 @@ __revision__ = '$Format:%H$'
 import os
 import json

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtWidgets import QDialog, QTreeWidgetItem

 from processing.core.ProcessingLog import ProcessingLog
--- a/python/plugins/processing/gui/HistoryDialog.py
+++ b/python/plugins/processing/gui/HistoryDialog.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import Qt
 from qgis.PyQt.QtWidgets import QAction, QPushButton, QDialogButtonBox, QStyle, QMessageBox, QFileDialog, QMenu, QTreeWidgetItem
 from qgis.PyQt.QtGui import QIcon
--- a/python/plugins/processing/gui/InputLayerSelectorPanel.py
+++ b/python/plugins/processing/gui/InputLayerSelectorPanel.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import QSettings
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QFileDialog
--- a/python/plugins/processing/gui/MessageDialog.py
+++ b/python/plugins/processing/gui/MessageDialog.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtGui import QDesktopServices
 from qgis.PyQt.QtWidgets import QDockWidget

--- a/python/plugins/processing/gui/MultipleFileInputDialog.py
+++ b/python/plugins/processing/gui/MultipleFileInputDialog.py
@ -29,7 +29,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import QSettings
 from qgis.PyQt.QtWidgets import QDialog, QAbstractItemView, QPushButton, QDialogButtonBox, QFileDialog
 from qgis.PyQt.QtGui import QStandardItemModel, QStandardItem
--- a/python/plugins/processing/gui/MultipleInputDialog.py
+++ b/python/plugins/processing/gui/MultipleInputDialog.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import Qt
 from qgis.PyQt.QtWidgets import QDialog, QAbstractItemView, QPushButton, QDialogButtonBox
 from qgis.PyQt.QtGui import QStandardItemModel, QStandardItem
--- a/python/plugins/processing/gui/MultipleInputPanel.py
+++ b/python/plugins/processing/gui/MultipleInputPanel.py
@ -28,7 +28,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import pyqtSignal

 from processing.gui.MultipleInputDialog import MultipleInputDialog
--- a/python/plugins/processing/gui/NumberInputDialog.py
+++ b/python/plugins/processing/gui/NumberInputDialog.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtWidgets import QDialog, QTreeWidgetItem, QMessageBox
 from qgis.core import QgsRasterLayer

--- a/python/plugins/processing/gui/NumberInputPanel.py
+++ b/python/plugins/processing/gui/NumberInputPanel.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import pyqtSignal

 from math import log10, floor
--- a/python/plugins/processing/gui/OutputSelectionPanel.py
+++ b/python/plugins/processing/gui/OutputSelectionPanel.py
@ -28,7 +28,7 @@ __revision__ = '$Format:%H$'
 import re
 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import QCoreApplication, QSettings
 from qgis.PyQt.QtWidgets import QDialog, QMenu, QAction, QFileDialog
 from qgis.PyQt.QtGui import QCursor
--- a/python/plugins/processing/gui/ParametersPanel.py
+++ b/python/plugins/processing/gui/ParametersPanel.py
@ -34,7 +34,7 @@ import locale

 from qgis.core import QgsMapLayerRegistry, QgsMapLayer

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import QCoreApplication, QVariant
 from qgis.PyQt.QtWidgets import QWidget, QLayout, QVBoxLayout, QHBoxLayout, QToolButton, QLabel, QCheckBox, QComboBox, QLineEdit, QPlainTextEdit
 from qgis.PyQt.QtGui import QIcon
--- a/python/plugins/processing/gui/PointSelectionPanel.py
+++ b/python/plugins/processing/gui/PointSelectionPanel.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic

 from qgis.utils import iface

--- a/python/plugins/processing/gui/PostgisTableSelector.py
+++ b/python/plugins/processing/gui/PostgisTableSelector.py
@ -30,7 +30,7 @@ import os
 from qgis.PyQt.QtCore import QSettings
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QTreeWidgetItem, QMessageBox
-from PyQt import uic
+from qgis.PyQt import uic
 from processing.algs.qgis.postgis_utils import GeoDB
 from qgis.core import QgsDataSourceURI, QgsCredentials

--- a/python/plugins/processing/gui/ProcessingToolbox.py
+++ b/python/plugins/processing/gui/ProcessingToolbox.py
@ -28,7 +28,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import Qt, QCoreApplication
 from qgis.PyQt.QtWidgets import QMenu, QAction, QTreeWidgetItem, QLabel, QMessageBox
 from qgis.utils import iface
--- a/python/plugins/processing/gui/RangePanel.py
+++ b/python/plugins/processing/gui/RangePanel.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic

 pluginPath = os.path.split(os.path.dirname(__file__))[0]
 WIDGET, BASE = uic.loadUiType(
--- a/python/plugins/processing/gui/RenderingStyleFilePanel.py
+++ b/python/plugins/processing/gui/RenderingStyleFilePanel.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtWidgets import QFileDialog

 from processing.tools.system import isWindows
--- a/python/plugins/processing/gui/ResultsDialog.py
+++ b/python/plugins/processing/gui/ResultsDialog.py
@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'

 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import QUrl
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QStyle, QTreeWidgetItem
--- a/python/plugins/processing/gui/ScriptEditorDialog.py
+++ b/python/plugins/processing/gui/ScriptEditorDialog.py
@ -31,7 +31,7 @@ import sys
 import json
 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import Qt
 from qgis.PyQt.QtGui import QIcon, QCursor
 from qgis.PyQt.QtWidgets import QMenu, QAction, QMessageBox, QFileDialog, QApplication
--- a/python/plugins/processing/gui/init.py
+++ b/python/plugins/processing/gui/init.py
@ -1,4 +1,4 @@
-from PyQt import uic
+from qgis.PyQt import uic
 import logging

 uic.properties.logger.setLevel(logging.WARNING)
--- a/python/plugins/processing/modeler/ModelerDialog.py
+++ b/python/plugins/processing/modeler/ModelerDialog.py
@ -30,7 +30,7 @@ import codecs
 import sys
 import os

-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import Qt, QRectF, QMimeData, QPoint, QPointF, QSettings, QByteArray
 from qgis.PyQt.QtWidgets import QGraphicsView, QTreeWidget, QMessageBox, QFileDialog, QTreeWidgetItem
 from qgis.PyQt.QtGui import QIcon, QImage, QPainter
--- a/python/server/init.py
+++ b/python/server/init.py
@ -23,6 +23,6 @@ __copyright__ = '(C) 2014, Alessandro Pasotti'
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'

-from PyQt import QtCore     # NOQA
+from qgis.PyQt import QtCore     # NOQA

 from qgis._server import *  # NOQA
--- a/tests/src/python/test_qgsauthsystem.py
+++ b/tests/src/python/test_qgsauthsystem.py
@ -22,9 +22,9 @@ from qgis.gui import QgsAuthEditorWidgets


 from qgis.PyQt.QtCore import QFileInfo, qDebug
-from qgis.PyQt.tWidgets import QDialog, QVBoxLayout, QDialogButtonBox
-from qgis.PyQt.tTest import QTest
-from qgis.PyQt.tNetwork import QSsl, QSslError, QSslSocket
+from qgis.PyQt.QtWidgets import QDialog, QVBoxLayout, QDialogButtonBox
+from qgis.PyQt.QtTest import QTest
+from qgis.PyQt.QtNetwork import QSsl, QSslError, QSslSocket

 from qgis.testing import (
    start_app,
--- a/tests/src/python/test_qgscomposerhtml.py
+++ b/tests/src/python/test_qgscomposerhtml.py
@ -17,7 +17,7 @@ import qgis  # NOQA
 import os

 from qgis.PyQt.QtCore import QUrl, qDebug
-from qgis.PyQt.tXml import QDomDocument
+from qgis.PyQt.QtXml import QDomDocument
 from qgis.core import (QgsComposition,
                       QgsComposerHtml,
                       QgsComposerFrame,
--- a/tests/src/python/test_qgscomposermap.py
+++ b/tests/src/python/test_qgscomposermap.py
@ -17,7 +17,7 @@ import qgis  # NOQA
 import os

 from qgis.PyQt.QtCore import QFileInfo
-from qgis.PyQt.tXml import QDomDocument
+from qgis.PyQt.QtXml import QDomDocument
 from qgis.PyQt.QtGui import QPainter

 from qgis.core import (QgsComposerMap,
--- a/tests/src/python/test_qgscomposition.py
+++ b/tests/src/python/test_qgscomposition.py
@ -17,7 +17,7 @@ import qgis  # NOQA
 import os

 from qgis.PyQt.QtCore import QFileInfo, QDir
-from qgis.PyQt.tXml import QDomDocument
+from qgis.PyQt.QtXml import QDomDocument

 from qgis.core import (QgsComposition,
                       QgsPoint,
--- a/tests/src/python/test_qgsgraduatedsymbolrendererv2.py
+++ b/tests/src/python/test_qgsgraduatedsymbolrendererv2.py
@ -29,7 +29,7 @@ from qgis.core import (QgsGraduatedSymbolRendererV2,
                       QgsRenderContext
                       )
 from qgis.PyQt.QtCore import Qt
-from qgis.PyQt.tXml import QDomDocument
+from qgis.PyQt.QtXml import QDomDocument
 from qgis.PyQt.QtGui import QColor

 start_app()
--- a/tests/src/python/test_qgslayerdefinition.py
+++ b/tests/src/python/test_qgslayerdefinition.py
@ -22,7 +22,7 @@ from qgis.core import (QgsProject,
 from qgis.testing import unittest, start_app
 from utilities import unitTestDataPath

-from qgis.PyQt.tXml import QDomDocument
+from qgis.PyQt.QtXml import QDomDocument

 start_app()
 TEST_DATA_DIR = unitTestDataPath()
--- a/tests/src/python/test_qgsnetworkcontentfetcher.py
+++ b/tests/src/python/test_qgsnetworkcontentfetcher.py
@ -19,7 +19,7 @@ from qgis.testing import unittest
 from qgis.core import QgsNetworkContentFetcher
 from utilities import unitTestDataPath
 from qgis.PyQt.QtCore import QUrl, QCoreApplication
-from qgis.PyQt.tNetwork import QNetworkReply
+from qgis.PyQt.QtNetwork import QNetworkReply
 import socketserver
 import threading
 import http.server
--- a/tests/src/python/test_qgspallabeling_composer.py
+++ b/tests/src/python/test_qgspallabeling_composer.py
@ -25,8 +25,8 @@ import subprocess

 from qgis.PyQt.QtCore import QRect, QRectF, QSize, QSizeF, qDebug
 from qgis.PyQt.QtGui import QImage, QColor, QPainter
-from qgis.PyQt.tPrintSupport import QPrinter
-from qgis.PyQt.tSvg import QSvgRenderer, QSvgGenerator
+from qgis.PyQt.QtPrintSupport import QPrinter
+from qgis.PyQt.QtSvg import QSvgRenderer, QSvgGenerator

 from qgis.core import QgsComposition, QgsMapSettings, QgsProject, QgsComposerMap

--- a/tests/src/python/test_qgsrelationeditwidget.py
+++ b/tests/src/python/test_qgsrelationeditwidget.py
@ -34,7 +34,7 @@ from qgis.gui import (
 )

 from qgis.PyQt.QtCore import QTimer
-from qgis.PyQt.tWidgets import QToolButton, QTableView, QApplication
+from qgis.PyQt.QtWidgets import QToolButton, QTableView, QApplication
 from qgis.testing import start_app, unittest

 start_app()
--- a/tests/src/python/test_qgssymbollayerv2.py
+++ b/tests/src/python/test_qgssymbollayerv2.py
@ -28,7 +28,7 @@ import qgis  # NOQA
 import os

 from qgis.PyQt.QtCore import pyqtWrapperType, Qt, QDir, QFile, QIODevice, QPointF
-from qgis.PyQt.tXml import QDomDocument
+from qgis.PyQt.QtXml import QDomDocument
 from qgis.PyQt.QtGui import QColor

 from qgis.core import (QgsCentroidFillSymbolLayerV2,