Fix qgis.PyQt compatibility imports

qgis · Apr 29, 2016 · abfd774
1 parent 8071acd
commit abfd774
Show file tree

Hide file tree

Showing 50 changed files with 66 additions and 66 deletions.
diff --git a/python/__init__.py b/python/__init__.py
@@ -23,7 +23,7 @@
 # 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
 
 

diff --git a/python/analysis/__init__.py b/python/analysis/__init__.py
@@ -23,6 +23,6 @@
 # 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 *
diff --git a/python/networkanalysis/__init__.py b/python/networkanalysis/__init__.py
@@ -23,6 +23,6 @@
 # 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 *
diff --git a/python/plugins/processing/algs/lidar/lastools/LAStoolsAlgorithm.py b/python/plugins/processing/algs/lidar/lastools/LAStoolsAlgorithm.py
@@ -28,7 +28,7 @@
 __revision__ = '$Format:%H$'
 
 import os
-from PyQt import QtGui
+from qgis.PyQt import QtGui
 from processing.core.GeoAlgorithm import GeoAlgorithm
 
 from .LAStoolsUtils import LAStoolsUtils

diff --git a/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py b/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py
@@ -28,7 +28,7 @@
 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

diff --git a/python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py b/python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py
@@ -29,7 +29,7 @@
 
 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

diff --git a/python/plugins/processing/core/ProcessingConfig.py b/python/plugins/processing/core/ProcessingConfig.py
@@ -27,7 +27,7 @@
 
 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

diff --git a/python/plugins/processing/gui/AlgorithmDialogBase.py b/python/plugins/processing/gui/AlgorithmDialogBase.py
@@ -28,7 +28,7 @@
 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
 

diff --git a/python/plugins/processing/gui/AutofillDialog.py b/python/plugins/processing/gui/AutofillDialog.py
@@ -27,7 +27,7 @@
 
 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]

diff --git a/python/plugins/processing/gui/BatchPanel.py b/python/plugins/processing/gui/BatchPanel.py
@@ -28,7 +28,7 @@
 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
 

diff --git a/python/plugins/processing/gui/ConfigDialog.py b/python/plugins/processing/gui/ConfigDialog.py
@@ -27,23 +27,23 @@
 
 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

diff --git a/python/plugins/processing/gui/CrsSelectionPanel.py b/python/plugins/processing/gui/CrsSelectionPanel.py
@@ -27,7 +27,7 @@
 
 import os
 
-from PyQt import uic
+from qgis.PyQt import uic
 
 from qgis.core import QgsCoordinateReferenceSystem
 from qgis.gui import QgsGenericProjectionSelector

diff --git a/python/plugins/processing/gui/EditRenderingStylesDialog.py b/python/plugins/processing/gui/EditRenderingStylesDialog.py
@@ -27,7 +27,7 @@
 
 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
 

diff --git a/python/plugins/processing/gui/ExtentSelectionPanel.py b/python/plugins/processing/gui/ExtentSelectionPanel.py
@@ -27,7 +27,7 @@
 
 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
 

diff --git a/python/plugins/processing/gui/FileSelectionPanel.py b/python/plugins/processing/gui/FileSelectionPanel.py
@@ -27,7 +27,7 @@
 
 import os
 
-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtWidgets import QFileDialog
 from qgis.PyQt.QtCore import QSettings
 

diff --git a/python/plugins/processing/gui/FixedTableDialog.py b/python/plugins/processing/gui/FixedTableDialog.py
@@ -27,7 +27,7 @@
 
 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
 

diff --git a/python/plugins/processing/gui/FixedTablePanel.py b/python/plugins/processing/gui/FixedTablePanel.py
@@ -27,7 +27,7 @@
 
 import os
 
-from PyQt import uic
+from qgis.PyQt import uic
 
 from processing.gui.FixedTableDialog import FixedTableDialog
 

diff --git a/python/plugins/processing/gui/GeometryPredicateSelectionPanel.py b/python/plugins/processing/gui/GeometryPredicateSelectionPanel.py
@@ -27,7 +27,7 @@
 
 import os
 
-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtWidgets import QCheckBox
 from qgis.core import QGis, QgsVectorLayer
 

diff --git a/python/plugins/processing/gui/GetScriptsAndModels.py b/python/plugins/processing/gui/GetScriptsAndModels.py
@@ -30,7 +30,7 @@
 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

diff --git a/python/plugins/processing/gui/HelpEditionDialog.py b/python/plugins/processing/gui/HelpEditionDialog.py
@@ -30,7 +30,7 @@
 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

diff --git a/python/plugins/processing/gui/HistoryDialog.py b/python/plugins/processing/gui/HistoryDialog.py
@@ -27,7 +27,7 @@
 
 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

diff --git a/python/plugins/processing/gui/InputLayerSelectorPanel.py b/python/plugins/processing/gui/InputLayerSelectorPanel.py
@@ -27,7 +27,7 @@
 
 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

diff --git a/python/plugins/processing/gui/MessageDialog.py b/python/plugins/processing/gui/MessageDialog.py
@@ -27,7 +27,7 @@
 
 import os
 
-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtGui import QDesktopServices
 from qgis.PyQt.QtWidgets import QDockWidget
 

diff --git a/python/plugins/processing/gui/MultipleFileInputDialog.py b/python/plugins/processing/gui/MultipleFileInputDialog.py
@@ -29,7 +29,7 @@
 
 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

diff --git a/python/plugins/processing/gui/MultipleInputDialog.py b/python/plugins/processing/gui/MultipleInputDialog.py
@@ -27,7 +27,7 @@
 
 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

diff --git a/python/plugins/processing/gui/MultipleInputPanel.py b/python/plugins/processing/gui/MultipleInputPanel.py
@@ -28,7 +28,7 @@
 
 import os
 
-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import pyqtSignal
 
 from processing.gui.MultipleInputDialog import MultipleInputDialog

diff --git a/python/plugins/processing/gui/NumberInputDialog.py b/python/plugins/processing/gui/NumberInputDialog.py
@@ -27,7 +27,7 @@
 
 import os
 
-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtWidgets import QDialog, QTreeWidgetItem, QMessageBox
 from qgis.core import QgsRasterLayer
 

diff --git a/python/plugins/processing/gui/NumberInputPanel.py b/python/plugins/processing/gui/NumberInputPanel.py
@@ -27,7 +27,7 @@
 
 import os
 
-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtCore import pyqtSignal
 
 from math import log10, floor

diff --git a/python/plugins/processing/gui/OutputSelectionPanel.py b/python/plugins/processing/gui/OutputSelectionPanel.py
@@ -28,7 +28,7 @@
 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

diff --git a/python/plugins/processing/gui/ParametersPanel.py b/python/plugins/processing/gui/ParametersPanel.py
@@ -34,7 +34,7 @@
 
 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

diff --git a/python/plugins/processing/gui/PointSelectionPanel.py b/python/plugins/processing/gui/PointSelectionPanel.py
@@ -27,7 +27,7 @@
 
 import os
 
-from PyQt import uic
+from qgis.PyQt import uic
 
 from qgis.utils import iface
 

diff --git a/python/plugins/processing/gui/PostgisTableSelector.py b/python/plugins/processing/gui/PostgisTableSelector.py
@@ -30,7 +30,7 @@
 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
 

diff --git a/python/plugins/processing/gui/ProcessingToolbox.py b/python/plugins/processing/gui/ProcessingToolbox.py
@@ -28,7 +28,7 @@
 
 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

diff --git a/python/plugins/processing/gui/RangePanel.py b/python/plugins/processing/gui/RangePanel.py
@@ -27,7 +27,7 @@
 
 import os
 
-from PyQt import uic
+from qgis.PyQt import uic
 
 pluginPath = os.path.split(os.path.dirname(__file__))[0]
 WIDGET, BASE = uic.loadUiType(

diff --git a/python/plugins/processing/gui/RenderingStyleFilePanel.py b/python/plugins/processing/gui/RenderingStyleFilePanel.py
@@ -27,7 +27,7 @@
 
 import os
 
-from PyQt import uic
+from qgis.PyQt import uic
 from qgis.PyQt.QtWidgets import QFileDialog
 
 from processing.tools.system import isWindows

diff --git a/python/plugins/processing/gui/ResultsDialog.py b/python/plugins/processing/gui/ResultsDialog.py
@@ -27,7 +27,7 @@
 
 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

diff --git a/python/plugins/processing/gui/ScriptEditorDialog.py b/python/plugins/processing/gui/ScriptEditorDialog.py
@@ -31,7 +31,7 @@
 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

diff --git 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