From be57cebd06064eb725fedd310624c83f410b963b Mon Sep 17 00:00:00 2001 From: Etienne Trimaille Date: Thu, 14 Feb 2019 15:44:07 -0400 Subject: [PATCH] change "from PyQt5" to "from qgis.PyQt" --- plugin_builder.py | 6 +++--- plugin_builder_dialog.py | 6 +++--- .../processing_provider/template/module_name_algorithm.tmpl | 2 +- plugin_templates/shared/test/qgis_interface.py | 2 +- plugin_templates/shared/test/test_translations.py | 2 +- plugin_templates/shared/test/utilities.py | 2 +- .../toolbutton_with_dialog/template/module_name.tmpl | 6 +++--- .../toolbutton_with_dialog/template/module_name_dialog.tmpl | 4 ++-- .../template/test/test_module_name_dialog.templ | 2 +- .../template/test/test_resources.templ | 2 +- .../toolbutton_with_dockwidget/template/module_name.tmpl | 6 +++--- .../template/module_name_dockwidget.tmpl | 4 ++-- .../template/test/test_module_name_dockwidget.templ | 2 +- .../template/test/test_resources.templ | 2 +- result_dialog.py | 2 +- select_tags_dialog.py | 2 +- test/qgis_interface.py | 2 +- test/utilities.py | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) diff --git a/plugin_builder.py b/plugin_builder.py index 4b12b61..1d30eb2 100644 --- a/plugin_builder.py +++ b/plugin_builder.py @@ -31,11 +31,11 @@ import subprocess # Import the PyQt and QGIS libraries -from PyQt5.QtCore import QFileInfo, QUrl, QFile, QDir, QSettings -from PyQt5.QtWidgets import ( +from qgis.PyQt.QtCore import QFileInfo, QUrl, QFile, QDir, QSettings +from qgis.PyQt.QtWidgets import ( QAction, QFileDialog, QMessageBox) -from PyQt5.QtGui import (QIcon, +from qgis.PyQt.QtGui import (QIcon, QDesktopServices, QStandardItemModel, QStandardItem diff --git a/plugin_builder_dialog.py b/plugin_builder_dialog.py index 61ddbf3..f2eb4c2 100644 --- a/plugin_builder_dialog.py +++ b/plugin_builder_dialog.py @@ -24,9 +24,9 @@ import os from string import capwords -from PyQt5 import QtGui, uic -from PyQt5.QtCore import Qt, QFileInfo -from PyQt5.QtWidgets import QMessageBox, QFrame, QDialog, QFileDialog +from qgis.PyQt import QtGui, uic +from qgis.PyQt.QtCore import Qt, QFileInfo +from qgis.PyQt.QtWidgets import QMessageBox, QFrame, QDialog, QFileDialog from .plugin_templates import templates FORM_CLASS, _ = uic.loadUiType(os.path.join( diff --git a/plugin_templates/processing_provider/template/module_name_algorithm.tmpl b/plugin_templates/processing_provider/template/module_name_algorithm.tmpl index d6a614d..333ba26 100644 --- a/plugin_templates/processing_provider/template/module_name_algorithm.tmpl +++ b/plugin_templates/processing_provider/template/module_name_algorithm.tmpl @@ -30,7 +30,7 @@ __copyright__ = '(C) $TemplateYear by $TemplateAuthor' __revision__ = '$TemplateVCSFormat' -from PyQt5.QtCore import QCoreApplication +from qgis.PyQt.QtCore import QCoreApplication from qgis.core import (QgsProcessing, QgsFeatureSink, QgsProcessingAlgorithm, diff --git a/plugin_templates/shared/test/qgis_interface.py b/plugin_templates/shared/test/qgis_interface.py index 3a65ed5..a407052 100644 --- a/plugin_templates/shared/test/qgis_interface.py +++ b/plugin_templates/shared/test/qgis_interface.py @@ -24,7 +24,7 @@ ) import logging -from PyQt5.QtCore import QObject, pyqtSlot, pyqtSignal +from qgis.PyQt.QtCore import QObject, pyqtSlot, pyqtSignal from qgis.core import QgsMapLayerRegistry from qgis.gui import QgsMapCanvasLayer LOGGER = logging.getLogger('QGIS') diff --git a/plugin_templates/shared/test/test_translations.py b/plugin_templates/shared/test/test_translations.py index 8c28a1a..035dc62 100644 --- a/plugin_templates/shared/test/test_translations.py +++ b/plugin_templates/shared/test/test_translations.py @@ -16,7 +16,7 @@ import unittest import os -from PyQt5.QtCore import QCoreApplication, QTranslator +from qgis.PyQt.QtCore import QCoreApplication, QTranslator QGIS_APP = get_qgis_app() diff --git a/plugin_templates/shared/test/utilities.py b/plugin_templates/shared/test/utilities.py index 9c7f1f4..be7ee3b 100644 --- a/plugin_templates/shared/test/utilities.py +++ b/plugin_templates/shared/test/utilities.py @@ -23,7 +23,7 @@ def get_qgis_app(): """ try: - from PyQt5 import QtGui, QtCore + from qgis.PyQt import QtGui, QtCore from qgis.core import QgsApplication from qgis.gui import QgsMapCanvas from .qgis_interface import QgisInterface diff --git a/plugin_templates/toolbutton_with_dialog/template/module_name.tmpl b/plugin_templates/toolbutton_with_dialog/template/module_name.tmpl index cb74c0e..4ea234d 100644 --- a/plugin_templates/toolbutton_with_dialog/template/module_name.tmpl +++ b/plugin_templates/toolbutton_with_dialog/template/module_name.tmpl @@ -21,9 +21,9 @@ * * ***************************************************************************/ """ -from PyQt5.QtCore import QSettings, QTranslator, qVersion, QCoreApplication -from PyQt5.QtGui import QIcon -from PyQt5.QtWidgets import QAction +from qgis.PyQt.QtCore import QSettings, QTranslator, qVersion, QCoreApplication +from qgis.PyQt.QtGui import QIcon +from qgis.PyQt.QtWidgets import QAction # Initialize Qt resources from file resources.py from .resources import * diff --git a/plugin_templates/toolbutton_with_dialog/template/module_name_dialog.tmpl b/plugin_templates/toolbutton_with_dialog/template/module_name_dialog.tmpl index c27711e..a101082 100644 --- a/plugin_templates/toolbutton_with_dialog/template/module_name_dialog.tmpl +++ b/plugin_templates/toolbutton_with_dialog/template/module_name_dialog.tmpl @@ -24,8 +24,8 @@ import os -from PyQt5 import uic -from PyQt5 import QtWidgets +from qgis.PyQt import uic +from qgis.PyQt import QtWidgets # This loads your .ui file so that PyQt can populate your plugin with the elements from Qt Designer FORM_CLASS, _ = uic.loadUiType(os.path.join( diff --git a/plugin_templates/toolbutton_with_dialog/template/test/test_module_name_dialog.templ b/plugin_templates/toolbutton_with_dialog/template/test/test_module_name_dialog.templ index 6afdef1..3b2ddbf 100644 --- a/plugin_templates/toolbutton_with_dialog/template/test/test_module_name_dialog.templ +++ b/plugin_templates/toolbutton_with_dialog/template/test/test_module_name_dialog.templ @@ -14,7 +14,7 @@ __copyright__ = 'Copyright $TemplateYear, $TemplateAuthor' import unittest -from PyQt5.QtGui import QDialogButtonBox, QDialog +from qgis.PyQt.QtGui import QDialogButtonBox, QDialog from ${TemplateModuleName}_dialog import ${TemplateClass}Dialog diff --git a/plugin_templates/toolbutton_with_dialog/template/test/test_resources.templ b/plugin_templates/toolbutton_with_dialog/template/test/test_resources.templ index b86094c..62a40b6 100644 --- a/plugin_templates/toolbutton_with_dialog/template/test/test_resources.templ +++ b/plugin_templates/toolbutton_with_dialog/template/test/test_resources.templ @@ -14,7 +14,7 @@ __copyright__ = 'Copyright $TemplateYear, $TemplateAuthor' import unittest -from PyQt5.QtGui import QIcon +from qgis.PyQt.QtGui import QIcon diff --git a/plugin_templates/toolbutton_with_dockwidget/template/module_name.tmpl b/plugin_templates/toolbutton_with_dockwidget/template/module_name.tmpl index 8cf0967..06f50d8 100644 --- a/plugin_templates/toolbutton_with_dockwidget/template/module_name.tmpl +++ b/plugin_templates/toolbutton_with_dockwidget/template/module_name.tmpl @@ -21,9 +21,9 @@ * * ***************************************************************************/ """ -from PyQt5.QtCore import QSettings, QTranslator, qVersion, QCoreApplication, Qt -from PyQt5.QtGui import QIcon -from PyQt5.QtWidgets import QAction +from qgis.PyQt.QtCore import QSettings, QTranslator, qVersion, QCoreApplication, Qt +from qgis.PyQt.QtGui import QIcon +from qgis.PyQt.QtWidgets import QAction # Initialize Qt resources from file resources.py from .resources import * diff --git a/plugin_templates/toolbutton_with_dockwidget/template/module_name_dockwidget.tmpl b/plugin_templates/toolbutton_with_dockwidget/template/module_name_dockwidget.tmpl index 2f58b86..918a36c 100644 --- a/plugin_templates/toolbutton_with_dockwidget/template/module_name_dockwidget.tmpl +++ b/plugin_templates/toolbutton_with_dockwidget/template/module_name_dockwidget.tmpl @@ -24,8 +24,8 @@ import os -from PyQt5 import QtGui, QtWidgets, uic -from PyQt5.QtCore import pyqtSignal +from qgis.PyQt import QtGui, QtWidgets, uic +from qgis.PyQt.QtCore import pyqtSignal FORM_CLASS, _ = uic.loadUiType(os.path.join( os.path.dirname(__file__), '${TemplateModuleName}_dockwidget_base.ui')) diff --git a/plugin_templates/toolbutton_with_dockwidget/template/test/test_module_name_dockwidget.templ b/plugin_templates/toolbutton_with_dockwidget/template/test/test_module_name_dockwidget.templ index 7290a1b..f3158db 100644 --- a/plugin_templates/toolbutton_with_dockwidget/template/test/test_module_name_dockwidget.templ +++ b/plugin_templates/toolbutton_with_dockwidget/template/test/test_module_name_dockwidget.templ @@ -14,7 +14,7 @@ __copyright__ = 'Copyright $TemplateYear, $TemplateAuthor' import unittest -from PyQt5.QtGui import QDockWidget +from qgis.PyQt.QtGui import QDockWidget from ${TemplateModuleName}_dockwidget import ${TemplateClass}DockWidget diff --git a/plugin_templates/toolbutton_with_dockwidget/template/test/test_resources.templ b/plugin_templates/toolbutton_with_dockwidget/template/test/test_resources.templ index b86094c..62a40b6 100644 --- a/plugin_templates/toolbutton_with_dockwidget/template/test/test_resources.templ +++ b/plugin_templates/toolbutton_with_dockwidget/template/test/test_resources.templ @@ -14,7 +14,7 @@ __copyright__ = 'Copyright $TemplateYear, $TemplateAuthor' import unittest -from PyQt5.QtGui import QIcon +from qgis.PyQt.QtGui import QIcon diff --git a/result_dialog.py b/result_dialog.py index 1bfc0f0..0a953f6 100644 --- a/result_dialog.py +++ b/result_dialog.py @@ -23,7 +23,7 @@ import os -from PyQt5 import QtGui, QtWidgets, uic +from qgis.PyQt import QtGui, QtWidgets, uic FORM_CLASS, _ = uic.loadUiType(os.path.join( os.path.dirname(__file__), 'results_dialog_base.ui')) diff --git a/select_tags_dialog.py b/select_tags_dialog.py index c97f5b1..933cf64 100644 --- a/select_tags_dialog.py +++ b/select_tags_dialog.py @@ -23,7 +23,7 @@ import os -from PyQt5 import QtGui, QtWidgets, uic +from qgis.PyQt import QtGui, QtWidgets, uic FORM_CLASS, _ = uic.loadUiType(os.path.join( os.path.dirname(__file__), 'select_tags_dialog_base.ui')) diff --git a/test/qgis_interface.py b/test/qgis_interface.py index 47716c7..cca77ab 100644 --- a/test/qgis_interface.py +++ b/test/qgis_interface.py @@ -27,7 +27,7 @@ ) import logging -from PyQt5.QtCore import QObject, pyqtSlot, pyqtSignal +from qgis.PyQt.QtCore import QObject, pyqtSlot, pyqtSignal from qgis.core import QgsMapLayerRegistry from qgis.gui import QgsMapCanvasLayer LOGGER = logging.getLogger('InaSAFE') diff --git a/test/utilities.py b/test/utilities.py index 469d365..f807e3c 100644 --- a/test/utilities.py +++ b/test/utilities.py @@ -32,7 +32,7 @@ def get_qgis_app(): """ try: - from PyQt5 import QtGui, QtCore + from qgis.PyQt import QtGui, QtCore from qgis.core import QgsApplication from qgis.gui import QgsMapCanvas from .qgis_interface import QgisInterface