Skip to content
Permalink
Browse files

Fix qgis.PyQt compatibility imports

  • Loading branch information
m-kuhn committed Apr 29, 2016
1 parent 8071acd commit abfd7740bd565542da6917a139800e78166c9149
Showing with 66 additions and 66 deletions.
  1. +1 −1 python/__init__.py
  2. +1 −1 python/analysis/__init__.py
  3. +1 −1 python/networkanalysis/__init__.py
  4. +1 −1 python/plugins/processing/algs/lidar/lastools/LAStoolsAlgorithm.py
  5. +1 −1 python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py
  6. +1 −1 python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py
  7. +1 −1 python/plugins/processing/core/ProcessingConfig.py
  8. +1 −1 python/plugins/processing/gui/AlgorithmDialogBase.py
  9. +1 −1 python/plugins/processing/gui/AutofillDialog.py
  10. +1 −1 python/plugins/processing/gui/BatchPanel.py
  11. +14 −14 python/plugins/processing/gui/ConfigDialog.py
  12. +1 −1 python/plugins/processing/gui/CrsSelectionPanel.py
  13. +1 −1 python/plugins/processing/gui/EditRenderingStylesDialog.py
  14. +1 −1 python/plugins/processing/gui/ExtentSelectionPanel.py
  15. +1 −1 python/plugins/processing/gui/FileSelectionPanel.py
  16. +1 −1 python/plugins/processing/gui/FixedTableDialog.py
  17. +1 −1 python/plugins/processing/gui/FixedTablePanel.py
  18. +1 −1 python/plugins/processing/gui/GeometryPredicateSelectionPanel.py
  19. +1 −1 python/plugins/processing/gui/GetScriptsAndModels.py
  20. +1 −1 python/plugins/processing/gui/HelpEditionDialog.py
  21. +1 −1 python/plugins/processing/gui/HistoryDialog.py
  22. +1 −1 python/plugins/processing/gui/InputLayerSelectorPanel.py
  23. +1 −1 python/plugins/processing/gui/MessageDialog.py
  24. +1 −1 python/plugins/processing/gui/MultipleFileInputDialog.py
  25. +1 −1 python/plugins/processing/gui/MultipleInputDialog.py
  26. +1 −1 python/plugins/processing/gui/MultipleInputPanel.py
  27. +1 −1 python/plugins/processing/gui/NumberInputDialog.py
  28. +1 −1 python/plugins/processing/gui/NumberInputPanel.py
  29. +1 −1 python/plugins/processing/gui/OutputSelectionPanel.py
  30. +1 −1 python/plugins/processing/gui/ParametersPanel.py
  31. +1 −1 python/plugins/processing/gui/PointSelectionPanel.py
  32. +1 −1 python/plugins/processing/gui/PostgisTableSelector.py
  33. +1 −1 python/plugins/processing/gui/ProcessingToolbox.py
  34. +1 −1 python/plugins/processing/gui/RangePanel.py
  35. +1 −1 python/plugins/processing/gui/RenderingStyleFilePanel.py
  36. +1 −1 python/plugins/processing/gui/ResultsDialog.py
  37. +1 −1 python/plugins/processing/gui/ScriptEditorDialog.py
  38. +1 −1 python/plugins/processing/gui/__init__.py
  39. +1 −1 python/plugins/processing/modeler/ModelerDialog.py
  40. +1 −1 python/server/__init__.py
  41. +3 −3 tests/src/python/test_qgsauthsystem.py
  42. +1 −1 tests/src/python/test_qgscomposerhtml.py
  43. +1 −1 tests/src/python/test_qgscomposermap.py
  44. +1 −1 tests/src/python/test_qgscomposition.py
  45. +1 −1 tests/src/python/test_qgsgraduatedsymbolrendererv2.py
  46. +1 −1 tests/src/python/test_qgslayerdefinition.py
  47. +1 −1 tests/src/python/test_qgsnetworkcontentfetcher.py
  48. +2 −2 tests/src/python/test_qgspallabeling_composer.py
  49. +1 −1 tests/src/python/test_qgsrelationeditwidget.py
  50. +1 −1 tests/src/python/test_qgssymbollayerv2.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


@@ -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 *
@@ -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 *
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

@@ -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]
@@ -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

@@ -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
@@ -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
@@ -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

@@ -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

@@ -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

@@ -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

@@ -27,7 +27,7 @@

import os

from PyQt import uic
from qgis.PyQt import uic

from processing.gui.FixedTableDialog import FixedTableDialog

@@ -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

@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

@@ -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
@@ -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
@@ -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
@@ -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

@@ -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
@@ -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
@@ -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
@@ -27,7 +27,7 @@

import os

from PyQt import uic
from qgis.PyQt import uic

from qgis.utils import iface

@@ -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

@@ -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
@@ -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(
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
from PyQt import uic
from qgis.PyQt import uic
import logging

uic.properties.logger.setLevel(logging.WARNING)
@@ -30,7 +30,7 @@
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
@@ -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 # NOQA
from qgis.PyQt import QtCore # NOQA

from qgis._server import * # NOQA
@@ -22,9 +22,9 @@


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,

3 comments on commit abfd774

@3nids

This comment has been minimized.

Copy link
Member

@3nids 3nids replied Apr 29, 2016

Thanks a lot !
Do we backport part of this to 2.14 finally ?

@m-kuhn

This comment has been minimized.

Copy link
Member Author

@m-kuhn m-kuhn replied May 2, 2016

@3nids

This comment has been minimized.

Copy link
Member

@3nids 3nids replied May 2, 2016

@m-kuhn thanks a lot!

Please sign in to comment.
You can’t perform that action at this time.