diff --git a/scripts/generate_test_mask_image.py b/scripts/generate_test_mask_image.py index 4c3cbf94e80..7af610a9bd2 100755 --- a/scripts/generate_test_mask_image.py +++ b/scripts/generate_test_mask_image.py @@ -8,7 +8,7 @@ import os import sys import argparse -from PyQt4.QtGui import QImage, QColor +from PyQt.QtGui import QImage, QColor import struct import urllib2 import glob diff --git a/scripts/qgis_fixes/fix_pyqt.py b/scripts/qgis_fixes/fix_pyqt.py index b1eccb0bc30..a7f007280a8 100644 --- a/scripts/qgis_fixes/fix_pyqt.py +++ b/scripts/qgis_fixes/fix_pyqt.py @@ -354,6 +354,7 @@ MAPPING = { "PyQt4.uic": [ ("PyQt.uic", [ "loadUiType", + "loadUi", ]), ], "PyQt4": [ diff --git a/scripts/widgets_tree.py b/scripts/widgets_tree.py index e5376ffecbb..0681ada8716 100644 --- a/scripts/widgets_tree.py +++ b/scripts/widgets_tree.py @@ -40,7 +40,7 @@ import sys import os import glob from PyQt.QtWidgets import QWidget, QDialog, QCheckBox, QComboBox, QDial, QPushButton, QLabel, QLCDNumber, QLineEdit, QRadioButton, QScrollBar, QSlider, QSpinBox, QTextEdit, QDateEdit, QTimeEdit, QDateTimeEdit, QListView, QProgressBar, QTableView, QTabWidget, QTextBrowser, QDialogButtonBox, QScrollArea, QGroupBox, QStackedWidget -from PyQt4.uic import loadUi +from PyQt.uic import loadUi from PyQt.QtXml import QDomDocument # qwt_plot is missing somehow but it may depend on installed packages diff --git a/tests/src/python/utilities.py b/tests/src/python/utilities.py index f3b1b494aa6..1614e6c3d31 100644 --- a/tests/src/python/utilities.py +++ b/tests/src/python/utilities.py @@ -19,7 +19,7 @@ import glob import platform import tempfile -from PyQt4.QtCore import QDir +from PyQt.QtCore import QDir from qgis.core import ( QgsCoordinateReferenceSystem,