diff --git a/.flake8 b/setup.cfg similarity index 96% rename from .flake8 rename to setup.cfg index e841c9de6116..69409e89eb6f 100644 --- a/.flake8 +++ b/setup.cfg @@ -1,6 +1,7 @@ [flake8] ignore = # module imported but unused + # done in the "tests" folder F401, # module level import not at top of file E402, @@ -129,3 +130,15 @@ exclude = # People using a virtualenv .venv/ venv/ + +[isort] +multi_line_output = 3 +include_trailing_comma = True +use_parentheses = True +ensure_newline_before_comments = True +lines_between_types = 1 +skip = + .venv, + venv, + # Clean later + python, diff --git a/tests/code_layout/doxygen_parser.py b/tests/code_layout/doxygen_parser.py index 2ad3383206ab..f5a66965b1fd 100644 --- a/tests/code_layout/doxygen_parser.py +++ b/tests/code_layout/doxygen_parser.py @@ -19,9 +19,9 @@ __date__ = 'May 2017' __copyright__ = '(C) 2017, Denis Rouzaud' -import re import glob import os +import re try: import xml.etree.ElementTree as ET diff --git a/tests/code_layout/test_qgsdoccoverage.py b/tests/code_layout/test_qgsdoccoverage.py index 00de280a4166..b0bb071c9767 100644 --- a/tests/code_layout/test_qgsdoccoverage.py +++ b/tests/code_layout/test_qgsdoccoverage.py @@ -11,15 +11,19 @@ import os import sys + try: from qgis.static_testing import unittest except ImportError: import unittest -from termcolor import colored - +from acceptable_missing_doc import ( + ACCEPTABLE_MISSING_ADDED_NOTE, + ACCEPTABLE_MISSING_BRIEF, + ACCEPTABLE_MISSING_DOCS, +) from doxygen_parser import DoxygenParser -from acceptable_missing_doc import ACCEPTABLE_MISSING_DOCS, ACCEPTABLE_MISSING_ADDED_NOTE, ACCEPTABLE_MISSING_BRIEF +from termcolor import colored # TO regenerate the list: # uncomment the lines under the `# GEN LIST` in tests/code_layout/doxygen_parser.py diff --git a/tests/code_layout/test_qgssipcoverage.py b/tests/code_layout/test_qgssipcoverage.py index eeeed45c6e96..bc8a87586f1e 100644 --- a/tests/code_layout/test_qgssipcoverage.py +++ b/tests/code_layout/test_qgssipcoverage.py @@ -10,19 +10,19 @@ __copyright__ = 'Copyright 2015, The QGIS Project' import os -from qgis.testing import unittest +# Import all the things! +from qgis.analysis import * # NOQA +from qgis.core import * # NOQA +from qgis.gui import * # NOQA +from qgis.testing import unittest +from termcolor import colored from utilities import printImportant -from doxygen_parser import DoxygenParser -from termcolor import colored +from doxygen_parser import DoxygenParser -# Import all the things! -from qgis.analysis import * # NOQA -from qgis.core import * # NOQA -from qgis.gui import * # NOQA try: - from qgis.server import * # NOQA + from qgis.server import * # NOQA except: pass diff --git a/tests/src/python/featuresourcetestbase.py b/tests/src/python/featuresourcetestbase.py index 71333bae546c..c73f36b424b6 100644 --- a/tests/src/python/featuresourcetestbase.py +++ b/tests/src/python/featuresourcetestbase.py @@ -11,21 +11,17 @@ __date__ = '2017-05-25' __copyright__ = 'Copyright 2017, The QGIS Project' +from qgis.PyQt.QtCore import QDate, QDateTime, Qt, QTime from qgis.core import ( - QgsRectangle, - QgsFeatureRequest, + NULL, + QgsCoordinateReferenceSystem, QgsFeature, - QgsWkbTypes, - QgsProject, + QgsFeatureRequest, QgsGeometry, - QgsAbstractFeatureIterator, - QgsExpressionContextScope, - QgsExpressionContext, - QgsVectorLayerFeatureSource, - QgsCoordinateReferenceSystem, - NULL + QgsProject, + QgsRectangle, + QgsWkbTypes, ) -from qgis.PyQt.QtCore import Qt, QDate, QTime, QDateTime from utilities import compareWkt diff --git a/tests/src/python/mockedwebserver.py b/tests/src/python/mockedwebserver.py index 75338604bd75..05ea18bd0b95 100644 --- a/tests/src/python/mockedwebserver.py +++ b/tests/src/python/mockedwebserver.py @@ -28,12 +28,12 @@ # DEALINGS IN THE SOFTWARE. ############################################################################### -from http.server import BaseHTTPRequestHandler, HTTPServer -from threading import Thread - import contextlib -import time import sys +import time + +from http.server import BaseHTTPRequestHandler, HTTPServer +from threading import Thread do_log = False custom_handler = None diff --git a/tests/src/python/offlineditingtestbase.py b/tests/src/python/offlineditingtestbase.py index edf880a4f196..0e4abac526dd 100644 --- a/tests/src/python/offlineditingtestbase.py +++ b/tests/src/python/offlineditingtestbase.py @@ -26,13 +26,13 @@ from time import sleep from qgis.core import ( + QgsExpression, QgsFeature, + QgsFeatureRequest, QgsGeometry, + QgsOfflineEditing, QgsPointXY, - QgsFeatureRequest, - QgsExpression, QgsProject, - QgsOfflineEditing, ) # Tet features, fields: [id, name, geometry] diff --git a/tests/src/python/provider_python.py b/tests/src/python/provider_python.py index acca481d6d8f..1c697ec2d486 100644 --- a/tests/src/python/provider_python.py +++ b/tests/src/python/provider_python.py @@ -12,43 +12,29 @@ __date__ = '2018-03-18' __copyright__ = 'Copyright 2018, The QGIS Project' +from qgis.PyQt.QtCore import QVariant from qgis.core import ( Qgis, - QgsField, - QgsFields, - QgsLayerDefinition, - QgsPointXY, - QgsReadWriteContext, - QgsVectorLayer, - QgsFeatureRequest, - QgsFeature, - QgsGeometry, - QgsProject, - QgsWkbTypes, + QgsAbstractFeatureIterator, + QgsAbstractFeatureSource, + QgsCoordinateTransform, + QgsCsException, + QgsDataProvider, QgsExpression, QgsExpressionContext, QgsExpressionContextUtils, - NULL, - QgsCoordinateTransform, - QgsMemoryProviderUtils, - QgsCoordinateReferenceSystem, - QgsRectangle, - QgsTestUtils, - QgsVectorDataProvider, - QgsAbstractFeatureSource, - QgsAbstractFeatureIterator, + QgsFeature, QgsFeatureIterator, - QgsApplication, - QgsProviderRegistry, - QgsProviderMetadata, - QgsGeometryEngine, + QgsFeatureRequest, + QgsFields, + QgsGeometry, + QgsProject, + QgsRectangle, QgsSpatialIndex, - QgsDataProvider, - QgsCsException, + QgsVectorDataProvider, + QgsVectorLayer, ) -from qgis.PyQt.QtCore import QVariant - class PyFeatureIterator(QgsAbstractFeatureIterator): diff --git a/tests/src/python/providertestbase.py b/tests/src/python/providertestbase.py index 821c90dc4425..2c0f77f83d47 100644 --- a/tests/src/python/providertestbase.py +++ b/tests/src/python/providertestbase.py @@ -11,30 +11,29 @@ __date__ = '2015-04-27' __copyright__ = 'Copyright 2015, The QGIS Project' +from qgis.PyQt.QtCore import QDate, QDateTime, Qt, QTime, QVariant +from qgis.PyQt.QtTest import QSignalSpy from qgis.core import ( - QgsApplication, - QgsRectangle, - QgsFeatureRequest, - QgsFeature, - QgsGeometry, + NULL, QgsAbstractFeatureIterator, - QgsExpressionContextScope, - QgsExpressionContext, + QgsApplication, + QgsDataProvider, QgsExpression, - QgsVectorDataProvider, - QgsVectorLayerFeatureSource, + QgsExpressionContext, + QgsExpressionContextScope, + QgsFeature, + QgsFeatureRequest, QgsFeatureSink, - QgsTestUtils, QgsFeatureSource, QgsFieldConstraints, - QgsDataProvider, + QgsGeometry, + QgsRectangle, + QgsTestUtils, + QgsVectorDataProvider, + QgsVectorLayerFeatureSource, QgsVectorLayerUtils, - NULL ) -from qgis.PyQt.QtCore import Qt, QDate, QTime, QDateTime, QVariant -from qgis.PyQt.QtTest import QSignalSpy -from utilities import compareWkt from featuresourcetestbase import FeatureSourceTestCase diff --git a/tests/src/python/qgis_local_server.py b/tests/src/python/qgis_local_server.py index 9e021afb3a32..b8e5f68e66b8 100644 --- a/tests/src/python/qgis_local_server.py +++ b/tests/src/python/qgis_local_server.py @@ -10,31 +10,28 @@ __date__ = '2014/02/11' __copyright__ = 'Copyright 2014, The QGIS Project' -import sys import os -import shutil import platform +import shutil import subprocess +import sys +import tempfile import time -import urllib.request -import urllib.parse -import urllib.error -import urllib.request import urllib.error import urllib.parse -import tempfile +import urllib.request from utilities import ( - unitTestDataPath, getExecutablePath, + getTempfilePath, openInBrowserTab, - getTempfilePath + unitTestDataPath, ) # allow import error to be raised if qgis is not on sys.path try: # noinspection PyUnresolvedReferences - from qgis.core import QgsRectangle, QgsCoordinateReferenceSystem + from qgis.core import QgsCoordinateReferenceSystem, QgsRectangle except ImportError as e: raise ImportError(str(e) + '\n\nPlace path to pyqgis modules on sys.path,' ' or assign to PYTHONPATH') diff --git a/tests/src/python/qgis_wrapped_server.py b/tests/src/python/qgis_wrapped_server.py index ed3bfd6e5574..4187a39ca476 100644 --- a/tests/src/python/qgis_wrapped_server.py +++ b/tests/src/python/qgis_wrapped_server.py @@ -124,17 +124,24 @@ # executions os.environ['QT_HASH_SEED'] = '1' -import sys +import copy +import math import signal import ssl -import math -import copy +import sys import urllib.parse + from http.server import BaseHTTPRequestHandler, HTTPServer from socketserver import ThreadingMixIn from qgis.core import QgsApplication -from qgis.server import QgsServer, QgsServerRequest, QgsBufferServerRequest, QgsBufferServerResponse, QgsServerFilter +from qgis.server import ( + QgsBufferServerRequest, + QgsBufferServerResponse, + QgsServer, + QgsServerFilter, + QgsServerRequest, +) QGIS_SERVER_PORT = int(os.environ.get('QGIS_SERVER_PORT', '8081')) QGIS_SERVER_HOST = os.environ.get('QGIS_SERVER_HOST', '127.0.0.1') @@ -258,10 +265,11 @@ def requestReady(self): qgs_server.serverInterface().registerFilter(xyzfilter) if QGIS_SERVER_OAUTH2_AUTH: - from qgis.server import QgsServerFilter - from oauthlib.oauth2 import RequestValidator, LegacyApplicationServer from datetime import datetime + from oauthlib.oauth2 import LegacyApplicationServer, RequestValidator + from qgis.server import QgsServerFilter + # Naive token storage implementation _tokens = {} diff --git a/tests/src/python/qgslayermetadataprovidertestbase.py b/tests/src/python/qgslayermetadataprovidertestbase.py index 0d0656bc1bd3..6a28c10756ae 100644 --- a/tests/src/python/qgslayermetadataprovidertestbase.py +++ b/tests/src/python/qgslayermetadataprovidertestbase.py @@ -11,24 +11,22 @@ __date__ = '2022-08-19' __copyright__ = 'Copyright 2022, ItOpen' -import os - +from qgis.PyQt.QtCore import QCoreApplication from qgis.core import ( - QgsVectorLayer, - QgsRasterLayer, - QgsMapLayerType, - QgsProviderRegistry, - QgsWkbTypes, + QgsBox3d, QgsLayerMetadata, + QgsMapLayerType, + QgsMetadataSearchContext, QgsProviderMetadata, - QgsBox3d, + QgsProviderRegistry, + QgsRasterLayer, QgsRectangle, - QgsMetadataSearchContext, + QgsVectorLayer, + QgsWkbTypes, ) +from qgis.testing import start_app -from qgis.PyQt.QtCore import QCoreApplication from utilities import compareWkt, unitTestDataPath -from qgis.testing import start_app QGIS_APP = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/qgslayoutchecker.py b/tests/src/python/qgslayoutchecker.py index 6941b8c404fe..ca7eb6ed793c 100644 --- a/tests/src/python/qgslayoutchecker.py +++ b/tests/src/python/qgslayoutchecker.py @@ -15,10 +15,9 @@ ''' import qgis # NOQA - -from qgis.PyQt.QtCore import QSize, QDir, QFileInfo +from qgis.PyQt.QtCore import QDir, QFileInfo, QSize from qgis.PyQt.QtGui import QImage, QPainter -from qgis.core import QgsMultiRenderChecker, QgsLayoutExporter +from qgis.core import QgsLayoutExporter, QgsMultiRenderChecker class QgsLayoutChecker(QgsMultiRenderChecker): diff --git a/tests/src/python/stylestoragebase.py b/tests/src/python/stylestoragebase.py index c691b456f6ac..9c6abf1cc526 100644 --- a/tests/src/python/stylestoragebase.py +++ b/tests/src/python/stylestoragebase.py @@ -11,22 +11,19 @@ __date__ = '2022-11-07' __copyright__ = 'Copyright 2022, ItOpen' -from qgis.testing import start_app, unittest from qgis.PyQt.QtCore import QCoreApplication, QVariant from qgis.PyQt.QtGui import QColor - from qgis.core import ( - QgsProviderRegistry, - QgsSettings, QgsAbstractDatabaseProviderConnection, + QgsCoordinateReferenceSystem, QgsField, QgsFields, - QgsCoordinateReferenceSystem, - QgsWkbTypes, + QgsProviderRegistry, + QgsSettings, QgsVectorLayer, + QgsWkbTypes, ) - -import time +from qgis.testing import start_app, unittest class StyleStorageTestCaseBase(unittest.TestCase): diff --git a/tests/src/python/test_authmanager_oauth2_ows.py b/tests/src/python/test_authmanager_oauth2_ows.py index 584c516c8529..7666314dac3c 100644 --- a/tests/src/python/test_authmanager_oauth2_ows.py +++ b/tests/src/python/test_authmanager_oauth2_ows.py @@ -14,16 +14,15 @@ the Free Software Foundation; either version 2 of the License, or (at your option) any later version. """ +import json import os -import sys +import random import re +import stat import subprocess +import sys import tempfile import urllib -import stat -import json -import time -import random __author__ = 'Alessandro Pasotti' __date__ = '20/04/2017' @@ -31,20 +30,15 @@ from shutil import rmtree -from utilities import unitTestDataPath, waitServer from qgis.core import ( QgsApplication, QgsAuthMethodConfig, - QgsVectorLayer, QgsRasterLayer, + QgsVectorLayer, ) - from qgis.PyQt.QtNetwork import QSslCertificate - -from qgis.testing import ( - start_app, - unittest, -) +from qgis.testing import start_app, unittest +from utilities import unitTestDataPath, waitServer try: QGIS_SERVER_ENDPOINT_PORT = os.environ['QGIS_SERVER_ENDPOINT_PORT'] diff --git a/tests/src/python/test_authmanager_ogr.py b/tests/src/python/test_authmanager_ogr.py index a8241beff3f4..da0c13fb8c26 100644 --- a/tests/src/python/test_authmanager_ogr.py +++ b/tests/src/python/test_authmanager_ogr.py @@ -11,16 +11,10 @@ from qgis.core import ( QgsApplication, - QgsAuthManager, QgsAuthMethodConfig, - QgsDataSourceUri, QgsProviderRegistry, ) - -from qgis.testing import ( - start_app, - unittest, -) +from qgis.testing import start_app, unittest __author__ = 'Alessandro Pasotti' __date__ = '14/11/2017' diff --git a/tests/src/python/test_authmanager_ogr_postgres.py b/tests/src/python/test_authmanager_ogr_postgres.py index 5eeadf7dbc7d..b05e00401f39 100644 --- a/tests/src/python/test_authmanager_ogr_postgres.py +++ b/tests/src/python/test_authmanager_ogr_postgres.py @@ -24,30 +24,22 @@ (at your option) any later version. """ import os -import time import signal import stat import subprocess import tempfile - +import time from shutil import rmtree -from utilities import unitTestDataPath +from qgis.PyQt.QtNetwork import QSslCertificate from qgis.core import ( QgsApplication, - QgsAuthManager, QgsAuthMethodConfig, QgsVectorLayer, - QgsDataSourceUri, - QgsWkbTypes, ) +from qgis.testing import start_app, unittest -from qgis.PyQt.QtNetwork import QSslCertificate - -from qgis.testing import ( - start_app, - unittest, -) +from utilities import unitTestDataPath __author__ = 'Alessandro Pasotti' __date__ = '03/11/2017' diff --git a/tests/src/python/test_authmanager_password_ows.py b/tests/src/python/test_authmanager_password_ows.py index a4aca5993bbd..6aaa40995d11 100644 --- a/tests/src/python/test_authmanager_password_ows.py +++ b/tests/src/python/test_authmanager_password_ows.py @@ -16,13 +16,14 @@ (at your option) any later version. """ import os -import sys +import random import re +import string import subprocess +import sys import tempfile -import random -import string import urllib + from functools import partial __author__ = 'Alessandro Pasotti' @@ -31,23 +32,16 @@ from shutil import rmtree -from utilities import unitTestDataPath, waitServer from qgis.core import ( QgsApplication, QgsAuthMethodConfig, - QgsVectorLayer, - QgsRasterLayer, QgsFileDownloader, + QgsRasterLayer, + QgsVectorLayer, ) - -from qgis.testing import ( - start_app, - unittest, -) -from qgis.PyQt.QtCore import ( - QEventLoop, - QUrl, -) +from qgis.PyQt.QtCore import QEventLoop, QUrl +from qgis.testing import start_app, unittest +from utilities import unitTestDataPath, waitServer try: QGIS_SERVER_ENDPOINT_PORT = os.environ['QGIS_SERVER_ENDPOINT_PORT'] diff --git a/tests/src/python/test_authmanager_password_postgres.py b/tests/src/python/test_authmanager_password_postgres.py index eb291bcb7d44..00b723d69443 100644 --- a/tests/src/python/test_authmanager_password_postgres.py +++ b/tests/src/python/test_authmanager_password_postgres.py @@ -21,31 +21,19 @@ (at your option) any later version. """ import os -import time -import signal -import stat -import subprocess -import tempfile - -from shutil import rmtree from contextlib import contextmanager -from utilities import unitTestDataPath +from qgis.PyQt.QtNetwork import QSslCertificate from qgis.core import ( QgsApplication, - QgsAuthManager, QgsAuthMethodConfig, - QgsVectorLayer, QgsDataSourceUri, + QgsVectorLayer, QgsWkbTypes, ) +from qgis.testing import start_app, unittest -from qgis.PyQt.QtNetwork import QSslCertificate - -from qgis.testing import ( - start_app, - unittest, -) +from utilities import unitTestDataPath __author__ = 'Alessandro Pasotti' __date__ = '25/10/2016' diff --git a/tests/src/python/test_authmanager_pki_ows.py b/tests/src/python/test_authmanager_pki_ows.py index 73a0bce9ea8a..5abc18a25f5b 100644 --- a/tests/src/python/test_authmanager_pki_ows.py +++ b/tests/src/python/test_authmanager_pki_ows.py @@ -15,12 +15,12 @@ (at your option) any later version. """ import os -import sys import re +import stat import subprocess +import sys import tempfile import urllib -import stat __author__ = 'Alessandro Pasotti' __date__ = '25/10/2016' @@ -28,21 +28,15 @@ from shutil import rmtree -from utilities import unitTestDataPath, waitServer from qgis.core import ( QgsApplication, - QgsAuthManager, QgsAuthMethodConfig, - QgsVectorLayer, QgsRasterLayer, + QgsVectorLayer, ) - from qgis.PyQt.QtNetwork import QSslCertificate - -from qgis.testing import ( - start_app, - unittest, -) +from qgis.testing import start_app, unittest +from utilities import unitTestDataPath, waitServer try: QGIS_SERVER_ENDPOINT_PORT = os.environ['QGIS_SERVER_ENDPOINT_PORT'] diff --git a/tests/src/python/test_authmanager_pki_postgres.py b/tests/src/python/test_authmanager_pki_postgres.py index 83604e4726e0..ef19a18477b0 100644 --- a/tests/src/python/test_authmanager_pki_postgres.py +++ b/tests/src/python/test_authmanager_pki_postgres.py @@ -20,33 +20,23 @@ the Free Software Foundation; either version 2 of the License, or (at your option) any later version. """ +import glob import os -import time -import signal import stat -import subprocess import tempfile -import glob -from shutil import rmtree - -from utilities import unitTestDataPath +from qgis.PyQt.QtCore import QFile +from qgis.PyQt.QtNetwork import QSslCertificate from qgis.core import ( QgsApplication, - QgsAuthManager, QgsAuthMethodConfig, - QgsVectorLayer, QgsDataSourceUri, + QgsVectorLayer, QgsWkbTypes, ) +from qgis.testing import start_app, unittest -from qgis.PyQt.QtNetwork import QSslCertificate -from qgis.PyQt.QtCore import QFile - -from qgis.testing import ( - start_app, - unittest, -) +from utilities import unitTestDataPath __author__ = 'Alessandro Pasotti' __date__ = '25/10/2016' diff --git a/tests/src/python/test_authmanager_proxy.py b/tests/src/python/test_authmanager_proxy.py index fcb322becbed..d593d06d9727 100644 --- a/tests/src/python/test_authmanager_proxy.py +++ b/tests/src/python/test_authmanager_proxy.py @@ -10,14 +10,17 @@ (at your option) any later version. """ import os -import re +import random import string -import sys -from shutil import rmtree import tempfile -import random +from shutil import rmtree -from qgis.core import QgsAuthManager, QgsAuthMethodConfig, QgsNetworkAccessManager, QgsSettings, QgsApplication +from qgis.core import ( + QgsApplication, + QgsAuthMethodConfig, + QgsNetworkAccessManager, + QgsSettings, +) from qgis.testing import start_app, unittest __author__ = 'Alessandro Pasotti' diff --git a/tests/src/python/test_authsettingswidget.py b/tests/src/python/test_authsettingswidget.py index a477f7de8641..b992814a3f9d 100644 --- a/tests/src/python/test_authsettingswidget.py +++ b/tests/src/python/test_authsettingswidget.py @@ -10,19 +10,18 @@ (at your option) any later version. """ import os -import re +import random import string -import sys -from shutil import rmtree import tempfile -import random +from shutil import rmtree -from qgis.core import QgsAuthMethodConfig, QgsNetworkAccessManager, QgsSettings, QgsApplication +from qgis.core import ( + QgsApplication, + QgsAuthMethodConfig, +) from qgis.gui import QgsAuthSettingsWidget from qgis.testing import start_app, unittest -from utilities import unitTestDataPath - __author__ = 'Alessandro Pasotti' __date__ = '27/09/2017' __copyright__ = 'Copyright 2017, The QGIS Project' diff --git a/tests/src/python/test_console.py b/tests/src/python/test_console.py index 70c0e97bbb67..62f2ecfe84be 100644 --- a/tests/src/python/test_console.py +++ b/tests/src/python/test_console.py @@ -9,13 +9,13 @@ __date__ = '15.4.2016' __copyright__ = 'Copyright 2015, The QGIS Project' -import qgis # NOQA import os -from qgis.testing import unittest, start_app +import qgis # NOQA from console import console -from qgis.core import QgsSettings from qgis.PyQt.QtCore import QCoreApplication +from qgis.core import QgsSettings +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_core_additions.py b/tests/src/python/test_core_additions.py index ca670ee46b2b..4292bd78c4b7 100644 --- a/tests/src/python/test_core_additions.py +++ b/tests/src/python/test_core_additions.py @@ -12,11 +12,13 @@ __copyright__ = 'Copyright 2015, The QGIS Project' import qgis # NOQA -import os -from qgis.testing import unittest, start_app -from qgis.core import metaEnumFromValue, metaEnumFromType, QgsTolerance, QgsMapLayer -from qgis.PyQt import sip +from qgis.core import ( + QgsMapLayer, + QgsTolerance, + metaEnumFromValue, +) +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_db_manager_gpkg.py b/tests/src/python/test_db_manager_gpkg.py index 430079b42b36..7d9813cd7e85 100644 --- a/tests/src/python/test_db_manager_gpkg.py +++ b/tests/src/python/test_db_manager_gpkg.py @@ -9,20 +9,18 @@ __date__ = '2016-10-17' __copyright__ = 'Copyright 2016, Even Rouault' -import qgis # NOQA - import os -import tempfile import shutil -from osgeo import gdal, ogr, osr +import tempfile -from qgis.core import QgsDataSourceUri, QgsSettings +import qgis # NOQA +from osgeo import gdal, ogr, osr +from plugins.db_manager.db_plugins import createDbPlugin, supportedDbTypes +from plugins.db_manager.db_plugins.plugin import TableField from qgis.PyQt.QtCore import QCoreApplication +from qgis.core import QgsDataSourceUri, QgsSettings from qgis.testing import start_app, unittest -from plugins.db_manager.db_plugins import supportedDbTypes, createDbPlugin -from plugins.db_manager.db_plugins.plugin import TableField - from utilities import unitTestDataPath diff --git a/tests/src/python/test_db_manager_postgis.py b/tests/src/python/test_db_manager_postgis.py index a73dda134057..360f62a97b61 100644 --- a/tests/src/python/test_db_manager_postgis.py +++ b/tests/src/python/test_db_manager_postgis.py @@ -9,32 +9,26 @@ __date__ = '2017-11-02' __copyright__ = 'Copyright 2017, Boundless Spatial Inc' +import glob import os -import shutil -import time import signal import stat import subprocess import tempfile -import glob +import time from shutil import rmtree +from plugins.db_manager.db_plugins import createDbPlugin, supportedDbTypes +from qgis.PyQt.QtCore import QCoreApplication, QFile +from qgis.PyQt.QtNetwork import QSslCertificate from qgis.core import ( QgsApplication, - QgsAuthManager, QgsAuthMethodConfig, - QgsVectorLayer, QgsDataSourceUri, - QgsSettings, QgsProviderRegistry, - QgsWkbTypes, + QgsSettings, ) -from qgis.PyQt.QtCore import QCoreApplication, QFile from qgis.testing import start_app, unittest -from qgis.PyQt.QtNetwork import QSslCertificate - -from plugins.db_manager.db_plugins import supportedDbTypes, createDbPlugin -from plugins.db_manager.db_plugins.plugin import TableField from utilities import unitTestDataPath diff --git a/tests/src/python/test_db_manager_spatialite.py b/tests/src/python/test_db_manager_spatialite.py index f4f10acb5e2d..145d11939777 100644 --- a/tests/src/python/test_db_manager_spatialite.py +++ b/tests/src/python/test_db_manager_spatialite.py @@ -9,20 +9,18 @@ __date__ = '2016-10-17' __copyright__ = 'Copyright 2016, Even Rouault' -import qgis # NOQA - import os -import tempfile import shutil -from osgeo import gdal, ogr, osr +import tempfile -from qgis.core import QgsDataSourceUri, QgsSettings +import qgis # NOQA +from osgeo import ogr +from plugins.db_manager.db_plugins import createDbPlugin, supportedDbTypes +from plugins.db_manager.db_plugins.plugin import TableField from qgis.PyQt.QtCore import QCoreApplication +from qgis.core import QgsDataSourceUri, QgsSettings from qgis.testing import start_app, unittest -from plugins.db_manager.db_plugins import supportedDbTypes, createDbPlugin -from plugins.db_manager.db_plugins.plugin import TableField - def GDAL_COMPUTE_VERSION(maj, min, rev): return ((maj) * 1000000 + (min) * 10000 + (rev) * 100) diff --git a/tests/src/python/test_db_manager_sql_window.py b/tests/src/python/test_db_manager_sql_window.py index 5f87878bd293..fff40ec7faac 100644 --- a/tests/src/python/test_db_manager_sql_window.py +++ b/tests/src/python/test_db_manager_sql_window.py @@ -11,8 +11,8 @@ __date__ = '2019-08-27' __copyright__ = 'Copyright 2019, Stephen Knox' -from qgis.testing import unittest from plugins.db_manager.dlg_sql_window import check_comments_in_sql +from qgis.testing import unittest class TestPyQgsDBManagerSQLWindow(unittest.TestCase): diff --git a/tests/src/python/test_disabled_tests.py b/tests/src/python/test_disabled_tests.py index f95af8961ef3..13a1e310f964 100644 --- a/tests/src/python/test_disabled_tests.py +++ b/tests/src/python/test_disabled_tests.py @@ -9,17 +9,16 @@ __date__ = '10/08/2022' __copyright__ = 'Copyright 2022, The QGIS Project' -import tempfile import os import shutil +import tempfile -from qgis.PyQt.QtCore import QEventLoop, QT_VERSION -from qgis.core import QgsDataCollectionItem, QgsLayerItem -from qgis.PyQt.QtCore import QVariant, QLocale +from qgis.PyQt.QtCore import QT_VERSION, QEventLoop, QLocale from qgis.PyQt.QtGui import QValidator -from qgis.core import QgsVectorLayer +from qgis.core import QgsDataCollectionItem, QgsLayerItem, QgsVectorLayer from qgis.gui import QgsFieldValidator from qgis.testing import start_app, unittest + from utilities import unitTestDataPath app = start_app() diff --git a/tests/src/python/test_hana_utils.py b/tests/src/python/test_hana_utils.py index 22cf88ebbc2c..81137241df5e 100644 --- a/tests/src/python/test_hana_utils.py +++ b/tests/src/python/test_hana_utils.py @@ -12,8 +12,7 @@ __copyright__ = 'Copyright 2019, The QGIS Project' from hdbcli import dbapi -from qgis.core import ( - QgsVectorLayer, QgsDataSourceUri) +from qgis.core import QgsDataSourceUri, QgsVectorLayer class QgsHanaProviderUtils: diff --git a/tests/src/python/test_layer_dependencies.py b/tests/src/python/test_layer_dependencies.py index 76d3909a5e9e..d2795fd9c5ec 100644 --- a/tests/src/python/test_layer_dependencies.py +++ b/tests/src/python/test_layer_dependencies.py @@ -9,31 +9,28 @@ __date__ = '12/07/2016' __copyright__ = 'Copyright 2016, The QGIS Project' -import qgis # NOQA import os - -from qgis.core import (QgsProject, - QgsVectorLayer, - QgsMapSettings, - QgsSnappingConfig, - QgsSnappingUtils, - Qgis, - QgsTolerance, - QgsRectangle, - QgsPointXY, - QgsFeature, - QgsGeometry, - QgsLayerDefinition, - QgsMapLayerDependency - ) - -from qgis.testing import start_app, unittest - -from qgis.PyQt.QtCore import QSize, QPoint -from qgis.PyQt.QtTest import QSignalSpy - import tempfile +import qgis # NOQA +from qgis.PyQt.QtCore import QPoint, QSize +from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import ( + Qgis, + QgsFeature, + QgsGeometry, + QgsLayerDefinition, + QgsMapLayerDependency, + QgsMapSettings, + QgsPointXY, + QgsProject, + QgsRectangle, + QgsSnappingConfig, + QgsSnappingUtils, + QgsTolerance, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest from qgis.utils import spatialite_connect # Convenience instances in case you may need them diff --git a/tests/src/python/test_offline_editing_wfs.py b/tests/src/python/test_offline_editing_wfs.py index d2a2f38a417d..0cdcab598502 100644 --- a/tests/src/python/test_offline_editing_wfs.py +++ b/tests/src/python/test_offline_editing_wfs.py @@ -25,24 +25,17 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import os -import sys import re import subprocess -from shutil import copytree, rmtree +import sys import tempfile -from utilities import unitTestDataPath, waitServer -from qgis.core import ( - QgsVectorLayer, - QgsAuthManager, - QgsApplication -) +from shutil import copytree, rmtree -from qgis.testing import ( - start_app, - unittest, -) +from qgis.core import QgsApplication, QgsVectorLayer +from qgis.testing import start_app, unittest from offlineditingtestbase import OfflineTestBase +from utilities import unitTestDataPath, waitServer try: QGIS_SERVER_OFFLINE_PORT = os.environ['QGIS_SERVER_OFFLINE_PORT'] diff --git a/tests/src/python/test_plugindependencies.py b/tests/src/python/test_plugindependencies.py index c570b2a6c431..fca191ada3bc 100644 --- a/tests/src/python/test_plugindependencies.py +++ b/tests/src/python/test_plugindependencies.py @@ -11,16 +11,13 @@ __date__ = '2018-09-19' __copyright__ = 'Copyright 2018, GISCE-TI S.L.' -import uuid -import os import json -from qgis.PyQt.QtCore import QCoreApplication -from pyplugin_installer.plugindependencies import find_dependencies +import os +import uuid -from qgis.testing import ( - start_app, - unittest, -) +from pyplugin_installer.plugindependencies import find_dependencies +from qgis.PyQt.QtCore import QCoreApplication +from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_processing_alg_decorator.py b/tests/src/python/test_processing_alg_decorator.py index f35f532f277f..84a1d72a9a78 100644 --- a/tests/src/python/test_processing_alg_decorator.py +++ b/tests/src/python/test_processing_alg_decorator.py @@ -9,14 +9,10 @@ __date__ = '10.12.2018' __copyright__ = 'Copyright 2018, The QGIS Project' -import sys -import os import qgis # NOQA -from qgis.testing import unittest, start_app from qgis.processing import alg -from qgis.core import QgsSettings -from qgis.PyQt.QtCore import QCoreApplication +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_processing_importintopostgis.py b/tests/src/python/test_processing_importintopostgis.py index 0a45ed27aadb..2f215a5454b9 100644 --- a/tests/src/python/test_processing_importintopostgis.py +++ b/tests/src/python/test_processing_importintopostgis.py @@ -9,17 +9,19 @@ __date__ = '2018-09' __copyright__ = 'Copyright 2019, The QGIS Project' -import re - from processing.core.Processing import Processing from processing.gui.AlgorithmExecutor import execute -from qgis.analysis import QgsNativeAlgorithms -from qgis.core import (QgsApplication, QgsVectorLayer, - QgsGeometry, QgsProcessingContext, - QgsProcessingFeedback, QgsSettings, - ) from qgis.PyQt.QtCore import QCoreApplication +from qgis.analysis import QgsNativeAlgorithms +from qgis.core import ( + QgsApplication, + QgsProcessingContext, + QgsProcessingFeedback, + QgsSettings, + QgsVectorLayer, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_processing_packagelayers.py b/tests/src/python/test_processing_packagelayers.py index dda65263347f..453c04536afd 100644 --- a/tests/src/python/test_processing_packagelayers.py +++ b/tests/src/python/test_processing_packagelayers.py @@ -9,21 +9,23 @@ __date__ = '2022-07' __copyright__ = 'Copyright 2022, The QGIS Project' -import re import os -from osgeo import gdal, ogr +from osgeo import ogr from processing.core.Processing import Processing from processing.gui.AlgorithmExecutor import execute -from qgis.analysis import QgsNativeAlgorithms -from qgis.core import (QgsApplication, QgsVectorLayer, - QgsGeometry, QgsProcessingContext, - QgsProcessingFeedback, QgsSettings, - QgsProviderRegistry, QgsProject, QgsRelation - ) from qgis.PyQt.QtCore import QCoreApplication, QTemporaryDir +from qgis.analysis import QgsNativeAlgorithms +from qgis.core import ( + QgsApplication, + QgsProcessingContext, + QgsProcessingFeedback, + QgsProject, + QgsRelation, + QgsSettings, + QgsVectorLayer, +) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_project_storage_base.py b/tests/src/python/test_project_storage_base.py index ce4212c58c66..3bf8c100142b 100644 --- a/tests/src/python/test_project_storage_base.py +++ b/tests/src/python/test_project_storage_base.py @@ -13,19 +13,12 @@ import qgis # NOQA -import os -import time - +from PyQt5.QtCore import QDateTime from qgis.core import ( QgsApplication, - QgsDataSourceUri, - QgsVectorLayer, QgsProject, + QgsVectorLayer, ) -from PyQt5.QtCore import QDateTime, QUrl, QUrlQuery -from qgis.PyQt.QtSql import QSqlDatabase, QSqlQuery -from qgis.testing import start_app, unittest -from utilities import unitTestDataPath class TestPyQgsProjectStorageBase: diff --git a/tests/src/python/test_project_storage_oracle.py b/tests/src/python/test_project_storage_oracle.py index 24d14c14b4c3..7f04d889460c 100644 --- a/tests/src/python/test_project_storage_oracle.py +++ b/tests/src/python/test_project_storage_oracle.py @@ -11,22 +11,19 @@ __date__ = '2022-04-19' __copyright__ = 'Copyright 2022, The QGIS Project' -import qgis # NOQA - import os -import time +import qgis # NOQA +from PyQt5.QtCore import QUrl, QUrlQuery +from qgis.PyQt.QtSql import QSqlDatabase, QSqlQuery from qgis.core import ( - QgsApplication, QgsDataSourceUri, QgsVectorLayer, - QgsProject, ) -from PyQt5.QtCore import QDateTime, QUrl, QUrlQuery -from qgis.PyQt.QtSql import QSqlDatabase, QSqlQuery from qgis.testing import start_app, unittest -from utilities import unitTestDataPath + from test_project_storage_base import TestPyQgsProjectStorageBase +from utilities import unitTestDataPath QGISAPP = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_project_storage_postgres.py b/tests/src/python/test_project_storage_postgres.py index e03a64d5dca7..5dcf86bb1270 100644 --- a/tests/src/python/test_project_storage_postgres.py +++ b/tests/src/python/test_project_storage_postgres.py @@ -14,22 +14,19 @@ __date__ = '2018-03-29' __copyright__ = 'Copyright 2018, The QGIS Project' -import qgis # NOQA -import psycopg2 - import os -import time +import psycopg2 +import qgis # NOQA +from PyQt5.QtCore import QUrl, QUrlQuery from qgis.core import ( - QgsApplication, QgsDataSourceUri, QgsVectorLayer, - QgsProject, ) -from PyQt5.QtCore import QDateTime, QUrl, QUrlQuery from qgis.testing import start_app, unittest -from utilities import unitTestDataPath + from test_project_storage_base import TestPyQgsProjectStorageBase +from utilities import unitTestDataPath QGISAPP = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_provider_afs.py b/tests/src/python/test_provider_afs.py index a0fa16c00f81..239b2b7bd0f8 100644 --- a/tests/src/python/test_provider_afs.py +++ b/tests/src/python/test_provider_afs.py @@ -12,34 +12,36 @@ __copyright__ = 'Copyright 2018, Nyall Dawson' import hashlib -import os -import re import tempfile -import shutil - -from qgis.PyQt.QtCore import QCoreApplication, Qt, QObject, QDate, QDateTime, QTime - -from qgis.core import (NULL, - QgsVectorLayer, - QgsLayerMetadata, - QgsBox3d, - QgsCoordinateReferenceSystem, - QgsApplication, - QgsSettings, - QgsRectangle, - QgsCategorizedSymbolRenderer, - QgsProviderRegistry, - QgsWkbTypes, - QgsDataSourceUri, - QgsVectorDataProviderTemporalCapabilities, - QgsFieldConstraints, - QgsVectorDataProvider, - QgsFeature, - QgsGeometry - ) -from qgis.testing import (start_app, - unittest - ) + +from qgis.PyQt.QtCore import ( + QCoreApplication, + QDate, + QDateTime, + QObject, + Qt, + QTime, +) +from qgis.core import ( + NULL, + QgsApplication, + QgsBox3d, + QgsCategorizedSymbolRenderer, + QgsCoordinateReferenceSystem, + QgsFeature, + QgsFieldConstraints, + QgsGeometry, + QgsLayerMetadata, + QgsProviderRegistry, + QgsRectangle, + QgsSettings, + QgsVectorDataProvider, + QgsVectorDataProviderTemporalCapabilities, + QgsVectorLayer, + QgsWkbTypes, +) +from qgis.testing import start_app, unittest + from providertestbase import ProviderTestCase diff --git a/tests/src/python/test_provider_gdal.py b/tests/src/python/test_provider_gdal.py index 494749bcc1d8..657a41ab8ecc 100644 --- a/tests/src/python/test_provider_gdal.py +++ b/tests/src/python/test_provider_gdal.py @@ -14,6 +14,7 @@ import struct from osgeo import gdal +from qgis.PyQt.QtCore import QTemporaryDir from qgis.core import ( Qgis, QgsPointXY, @@ -22,7 +23,6 @@ QgsRectangle, ) from qgis.testing import start_app, unittest -from qgis.PyQt.QtCore import QTemporaryDir from utilities import unitTestDataPath diff --git a/tests/src/python/test_provider_gpx.py b/tests/src/python/test_provider_gpx.py index 8d83b5bb7ef7..1773b4a29ecc 100644 --- a/tests/src/python/test_provider_gpx.py +++ b/tests/src/python/test_provider_gpx.py @@ -9,21 +9,11 @@ __date__ = '2021-07-30' __copyright__ = 'Copyright 2021, The QGIS Project' -from qgis.core import ( - QgsVectorLayer, - QgsFeature, - QgsPoint, - QgsProviderRegistry -) -from qgis.testing import ( - start_app, - unittest -) +from qgis.core import QgsFeature, QgsPoint, QgsProviderRegistry, QgsVectorLayer +from qgis.testing import start_app, unittest from providertestbase import ProviderTestCase -from utilities import ( - unitTestDataPath -) +from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_provider_hana.py b/tests/src/python/test_provider_hana.py index c76ad2f46b6a..23b2012716e4 100644 --- a/tests/src/python/test_provider_hana.py +++ b/tests/src/python/test_provider_hana.py @@ -17,15 +17,14 @@ import os -from providertestbase import ProviderTestCase -from PyQt5.QtCore import QVariant, QDate, QTime, QDateTime, QByteArray +from PyQt5.QtCore import QByteArray, QDate, QDateTime, QTime, QVariant from qgis.core import ( NULL, QgsCoordinateReferenceSystem, QgsDataProvider, QgsDataSourceUri, - QgsFeatureRequest, QgsFeature, + QgsFeatureRequest, QgsField, QgsFieldConstraints, QgsGeometry, @@ -36,8 +35,11 @@ QgsVectorDataProvider, QgsVectorLayer, QgsVectorLayerExporter, - QgsWkbTypes) + QgsWkbTypes, +) from qgis.testing import start_app, unittest + +from providertestbase import ProviderTestCase from test_hana_utils import QgsHanaProviderUtils from utilities import unitTestDataPath diff --git a/tests/src/python/test_provider_memory.py b/tests/src/python/test_provider_memory.py index fa8d4fb8182d..20a0c3537326 100644 --- a/tests/src/python/test_provider_memory.py +++ b/tests/src/python/test_provider_memory.py @@ -11,36 +11,30 @@ from urllib.parse import parse_qs -from qgis.PyQt.QtCore import QVariant, QByteArray, QDate, QDateTime, QTime +from qgis.PyQt.QtCore import QByteArray, QDate, QDateTime, QTime, QVariant from qgis.core import ( + NULL, + QgsCoordinateReferenceSystem, + QgsFeature, + QgsFeatureRequest, + QgsFeatureSink, + QgsFeatureSource, QgsField, QgsFields, + QgsGeometry, QgsLayerDefinition, + QgsMemoryProviderUtils, QgsPointXY, QgsReadWriteContext, - QgsVectorLayer, - QgsFeatureRequest, - QgsFeature, - QgsGeometry, - QgsWkbTypes, - NULL, - QgsMemoryProviderUtils, - QgsCoordinateReferenceSystem, QgsRectangle, QgsTestUtils, - QgsFeatureSource, - QgsFeatureSink, -) -from qgis.testing import ( - start_app, - unittest + QgsVectorLayer, + QgsWkbTypes, ) +from qgis.testing import start_app, unittest from providertestbase import ProviderTestCase -from utilities import ( - unitTestDataPath, - compareWkt -) +from utilities import compareWkt, unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_provider_mssql.py b/tests/src/python/test_provider_mssql.py index 892008d38cb9..7911fcf07490 100644 --- a/tests/src/python/test_provider_mssql.py +++ b/tests/src/python/test_provider_mssql.py @@ -9,32 +9,32 @@ __date__ = '2015-12-07' __copyright__ = 'Copyright 2015, The QGIS Project' -import qgis # NOQA - import os -from qgis.core import (QgsSettings, - QgsVectorLayer, - QgsFeatureRequest, - QgsFeature, - QgsField, - QgsFields, - QgsFieldConstraints, - QgsDataSourceUri, - QgsWkbTypes, - QgsGeometry, - QgsPointXY, - QgsRectangle, - QgsProviderRegistry, - NULL, - QgsVectorLayerExporter, - QgsCoordinateReferenceSystem, - QgsDataProvider) - -from qgis.PyQt.QtCore import QDate, QTime, QDateTime, QVariant, QDir -from utilities import unitTestDataPath +import qgis # NOQA +from qgis.PyQt.QtCore import QDate, QDateTime, QDir, QTime, QVariant +from qgis.core import ( + NULL, + QgsCoordinateReferenceSystem, + QgsDataProvider, + QgsDataSourceUri, + QgsFeature, + QgsFeatureRequest, + QgsField, + QgsFieldConstraints, + QgsGeometry, + QgsPointXY, + QgsProviderRegistry, + QgsRectangle, + QgsSettings, + QgsVectorLayer, + QgsVectorLayerExporter, + QgsWkbTypes, +) from qgis.testing import start_app, unittest + from providertestbase import ProviderTestCase +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_provider_oapif.py b/tests/src/python/test_provider_oapif.py index 86f4e1527d09..847da93547c2 100644 --- a/tests/src/python/test_provider_oapif.py +++ b/tests/src/python/test_provider_oapif.py @@ -10,38 +10,24 @@ __copyright__ = 'Copyright 2019, Even Rouault' import copy -import json import hashlib +import json import os -import re import shutil import tempfile -from osgeo import gdal -from qgis.PyQt.QtCore import QCoreApplication, Qt, QObject, QDateTime, QVariant +from qgis.PyQt.QtCore import QCoreApplication, QDateTime, Qt from qgis.PyQt.QtTest import QSignalSpy - from qgis.core import ( - QgsWkbTypes, - QgsVectorLayer, - QgsFeature, - QgsGeometry, - QgsRectangle, - QgsPointXY, - QgsVectorDataProvider, - QgsFeatureRequest, QgsApplication, - QgsSettings, - QgsExpression, - QgsExpressionContextUtils, - QgsExpressionContext, - QgsCoordinateReferenceSystem, QgsBox3d, - QgsMessageLog + QgsFeatureRequest, + QgsRectangle, + QgsSettings, + QgsVectorLayer, ) -from qgis.testing import (start_app, - unittest - ) +from qgis.testing import start_app, unittest + from providertestbase import ProviderTestCase diff --git a/tests/src/python/test_provider_ogr.py b/tests/src/python/test_provider_ogr.py index d76c2c9f0f04..07a95a79b53b 100644 --- a/tests/src/python/test_provider_ogr.py +++ b/tests/src/python/test_provider_ogr.py @@ -17,50 +17,46 @@ from datetime import datetime from osgeo import gdal, ogr # NOQA -from qgis.PyQt.QtCore import QVariant, QByteArray, QTemporaryDir +from qgis.PyQt.QtCore import QByteArray, QTemporaryDir, QVariant from qgis.PyQt.QtXml import QDomDocument - from qgis.core import ( NULL, - QgsCoordinateReferenceSystem, - QgsAuthMethodConfig, + Qgis, + QgsAbstractDatabaseProviderConnection, QgsApplication, + QgsAuthMethodConfig, + QgsCoordinateReferenceSystem, QgsCoordinateTransformContext, + QgsDataProvider, + QgsDirectoryItem, QgsEditorWidgetSetup, - QgsProject, + QgsFeature, + QgsFeatureRequest, QgsField, + QgsFieldConstraints, QgsFields, QgsGeometry, - QgsRectangle, - QgsProviderRegistry, - QgsFeature, - QgsFeatureRequest, - QgsSettings, - QgsDataProvider, - QgsVectorDataProvider, - QgsVectorLayer, - QgsVectorFileWriter, - QgsVectorLayerExporter, - QgsWkbTypes, - QgsNetworkAccessManager, QgsLayerMetadata, - QgsNotSupportedException, QgsMapLayerType, - QgsProviderSublayerDetails, - Qgis, - QgsDirectoryItem, - QgsAbstractDatabaseProviderConnection, + QgsNetworkAccessManager, + QgsNotSupportedException, + QgsProject, QgsProviderConnectionException, QgsProviderMetadata, + QgsProviderRegistry, + QgsProviderSublayerDetails, + QgsRectangle, QgsRelation, + QgsSettings, QgsUnsetAttributeValue, - QgsFieldConstraints, - QgsWeakRelation -) - -from qgis.gui import ( - QgsGui + QgsVectorDataProvider, + QgsVectorFileWriter, + QgsVectorLayer, + QgsVectorLayerExporter, + QgsWeakRelation, + QgsWkbTypes, ) +from qgis.gui import QgsGui from qgis.testing import start_app, unittest from qgis.utils import spatialite_connect diff --git a/tests/src/python/test_provider_ogr_gpkg.py b/tests/src/python/test_provider_ogr_gpkg.py index 4d6ddf7d039e..86a5079f68df 100644 --- a/tests/src/python/test_provider_ogr_gpkg.py +++ b/tests/src/python/test_provider_ogr_gpkg.py @@ -18,39 +18,50 @@ import sys import tempfile import time +from sqlite3 import OperationalError import qgis # NOQA from osgeo import gdal, ogr -from providertestbase import ProviderTestCase -from qgis.core import (Qgis, - QgsFeature, - QgsCoordinateReferenceSystem, - QgsFeatureRequest, - QgsFeatureSink, - QgsFields, - QgsField, - QgsFieldConstraints, - QgsGeometry, - QgsProviderRegistry, - QgsRectangle, - QgsSettings, - QgsVectorLayer, - QgsVectorLayerExporter, - QgsPointXY, - QgsProject, - QgsWkbTypes, - QgsDataProvider, - QgsVectorDataProvider, - QgsLayerMetadata, - QgsProviderMetadata, - NULL) -from qgis.PyQt.QtCore import QCoreApplication, QVariant, QDate, QTime, QDateTime, Qt, QTemporaryDir, QFileInfo +from qgis.PyQt.QtCore import ( + QCoreApplication, + QDate, + QDateTime, + QFileInfo, + Qt, + QTemporaryDir, + QTime, + QVariant, +) from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + NULL, + Qgis, + QgsCoordinateReferenceSystem, + QgsDataProvider, + QgsFeature, + QgsFeatureRequest, + QgsFeatureSink, + QgsField, + QgsFieldConstraints, + QgsFields, + QgsGeometry, + QgsLayerMetadata, + QgsPointXY, + QgsProject, + QgsProviderMetadata, + QgsProviderRegistry, + QgsRectangle, + QgsSettings, + QgsVectorDataProvider, + QgsVectorLayer, + QgsVectorLayerExporter, + QgsWkbTypes, +) from qgis.testing import start_app, unittest from qgis.utils import spatialite_connect -from utilities import unitTestDataPath -from sqlite3 import OperationalError +from providertestbase import ProviderTestCase +from utilities import unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_provider_ogr_sqlite.py b/tests/src/python/test_provider_ogr_sqlite.py index caf40982e980..66dd6f738370 100644 --- a/tests/src/python/test_provider_ogr_sqlite.py +++ b/tests/src/python/test_provider_ogr_sqlite.py @@ -9,24 +9,24 @@ __date__ = '2016-06-01' __copyright__ = 'Copyright 2016, Even Rouault' -import qgis # NOQA - import os -import tempfile import shutil -import hashlib -from osgeo import gdal, ogr - -from qgis.core import (QgsVectorLayer, - QgsFeature, - QgsFeatureRequest, - QgsFieldConstraints, - QgsPointXY, - NULL, - QgsRectangle, - QgsVectorDataProvider) +import tempfile + +import qgis # NOQA +from osgeo import ogr +from qgis.PyQt.QtCore import QByteArray, QDate, QDateTime, QTime, QVariant +from qgis.core import ( + NULL, + QgsFeature, + QgsFeatureRequest, + QgsFieldConstraints, + QgsPointXY, + QgsRectangle, + QgsVectorDataProvider, + QgsVectorLayer, +) from qgis.testing import start_app, unittest -from qgis.PyQt.QtCore import QDate, QTime, QDateTime, QVariant, QByteArray start_app() diff --git a/tests/src/python/test_provider_oracle.py b/tests/src/python/test_provider_oracle.py index 5cecd3466060..2d2961d21b88 100644 --- a/tests/src/python/test_provider_oracle.py +++ b/tests/src/python/test_provider_oracle.py @@ -9,36 +9,34 @@ __date__ = '2016-07-06' __copyright__ = 'Copyright 2016, The QGIS Project' -import qgis # NOQA - import os +import qgis # NOQA +from qgis.PyQt.QtCore import QDate, QDateTime, QTime, QVariant +from qgis.PyQt.QtSql import QSqlDatabase, QSqlQuery from qgis.core import ( - Qgis, - QgsSettings, - QgsVectorLayer, - QgsFeatureRequest, NULL, - QgsProject, - QgsTransactionGroup, - QgsFeature, - QgsGeometry, - QgsWkbTypes, + Qgis, + QgsCoordinateReferenceSystem, QgsDataProvider, - QgsVectorLayerExporter, + QgsFeature, + QgsFeatureRequest, QgsField, QgsFields, - QgsCoordinateReferenceSystem, + QgsGeometry, + QgsProject, QgsProjUtils, - QgsProviderRegistry + QgsProviderRegistry, + QgsSettings, + QgsTransactionGroup, + QgsVectorLayer, + QgsVectorLayerExporter, + QgsWkbTypes, ) - -from qgis.PyQt.QtCore import QDate, QTime, QDateTime, QVariant -from qgis.PyQt.QtSql import QSqlDatabase, QSqlQuery - -from utilities import unitTestDataPath, compareWkt from qgis.testing import start_app, unittest + from providertestbase import ProviderTestCase +from utilities import compareWkt, unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_provider_postgres.py b/tests/src/python/test_provider_postgres.py index f59c63d93dce..cd6abcfbfbd5 100644 --- a/tests/src/python/test_provider_postgres.py +++ b/tests/src/python/test_provider_postgres.py @@ -18,51 +18,60 @@ __date__ = '2015-04-23' __copyright__ = 'Copyright 2015, The QGIS Project' -import qgis # NOQA -import psycopg2 - import os import time from datetime import datetime +import psycopg2 +import qgis # NOQA +from qgis.PyQt.QtCore import ( + QByteArray, + QDate, + QDateTime, + QDir, + QObject, + QTemporaryDir, + QTime, + QVariant, +) +from qgis.PyQt.QtWidgets import QLabel +from qgis.PyQt.QtXml import QDomDocument +from qgis.analysis import QgsNativeAlgorithms from qgis.core import ( + NULL, Qgis, QgsApplication, - QgsVectorLayer, - QgsVectorLayerExporter, + QgsCoordinateReferenceSystem, + QgsDataProvider, + QgsDataSourceUri, + QgsDefaultValue, + QgsFeature, QgsFeatureRequest, QgsFeatureSource, - QgsFeature, QgsFieldConstraints, - QgsDataProvider, - QgsVectorLayerUtils, - QgsSettings, - QgsTransactionGroup, - QgsReadWriteContext, - QgsRectangle, - QgsReferencedGeometry, - QgsDefaultValue, - QgsCoordinateReferenceSystem, - QgsProcessingUtils, + QgsGeometry, QgsProcessingContext, QgsProcessingFeedback, + QgsProcessingUtils, QgsProject, - QgsWkbTypes, - QgsGeometry, + QgsProviderConnectionException, QgsProviderRegistry, + QgsReadWriteContext, + QgsRectangle, + QgsReferencedGeometry, + QgsSettings, + QgsTransactionGroup, QgsVectorDataProvider, - QgsDataSourceUri, - QgsProviderConnectionException, - NULL, + QgsVectorLayer, + QgsVectorLayerExporter, + QgsVectorLayerUtils, + QgsWkbTypes, ) -from qgis.analysis import QgsNativeAlgorithms -from qgis.gui import QgsGui, QgsAttributeForm -from qgis.PyQt.QtCore import QDate, QTime, QDateTime, QVariant, QDir, QObject, QByteArray, QTemporaryDir -from qgis.PyQt.QtWidgets import QLabel +from qgis.gui import QgsAttributeForm, QgsGui from qgis.testing import start_app, unittest -from qgis.PyQt.QtXml import QDomDocument -from utilities import unitTestDataPath, compareWkt + from providertestbase import ProviderTestCase +from utilities import compareWkt, unitTestDataPath QGISAPP = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_provider_postgres_latency.py b/tests/src/python/test_provider_postgres_latency.py index 7870523caaaf..a3cee5eb944a 100644 --- a/tests/src/python/test_provider_postgres_latency.py +++ b/tests/src/python/test_provider_postgres_latency.py @@ -16,13 +16,12 @@ __date__ = '2021-06-13' __copyright__ = 'Copyright 2021, The QGIS Project' -import qgis # NOQA -import psycopg2 - import os import time -from qgis.core import QgsVectorLayer, QgsFeatureRequest +import psycopg2 +import qgis # NOQA +from qgis.core import QgsFeatureRequest, QgsVectorLayer from qgis.testing import start_app, unittest QGISAPP = start_app() diff --git a/tests/src/python/test_provider_postgresraster.py b/tests/src/python/test_provider_postgresraster.py index c99aec083ac0..77a57bef52c9 100644 --- a/tests/src/python/test_provider_postgresraster.py +++ b/tests/src/python/test_provider_postgresraster.py @@ -18,25 +18,22 @@ __date__ = '2019-12-20' __copyright__ = 'Copyright 2019, The QGIS Project' -import qgis # NOQA import os import time +import qgis # NOQA from qgis.core import ( - QgsSettings, - QgsReadWriteContext, - QgsRectangle, - QgsCoordinateReferenceSystem, - QgsProject, - QgsRasterLayer, + QgsDataSourceUri, QgsPointXY, - QgsRaster, QgsProviderRegistry, + QgsRaster, QgsRasterBandStats, - QgsDataSourceUri, + QgsRasterLayer, + QgsRectangle, ) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath, compareWkt + +from utilities import compareWkt, unitTestDataPath QGISAPP = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_provider_python.py b/tests/src/python/test_provider_python.py index a19e9cbf7739..0672aa8d92fa 100644 --- a/tests/src/python/test_provider_python.py +++ b/tests/src/python/test_provider_python.py @@ -23,43 +23,28 @@ __date__ = '2015-04-23' __copyright__ = 'Copyright 2015, The QGIS Project' - -import os - +from qgis.PyQt.QtCore import QDate, QDateTime, QTime, QVariant from qgis.core import ( + NULL, + QgsFeature, + QgsFeatureRequest, QgsField, - QgsFields, + QgsGeometry, QgsLayerDefinition, QgsPointXY, + QgsProviderMetadata, + QgsProviderRegistry, QgsReadWriteContext, - QgsVectorLayer, - QgsFeatureRequest, - QgsFeature, - QgsGeometry, - QgsWkbTypes, - NULL, - QgsMemoryProviderUtils, - QgsCoordinateReferenceSystem, QgsRectangle, QgsTestUtils, - QgsProviderMetadata, - QgsProviderRegistry, -) - -from qgis.testing import ( - start_app, - unittest -) - -from utilities import ( - unitTestDataPath, - compareWkt + QgsVectorLayer, + QgsWkbTypes, ) +from qgis.testing import start_app, unittest from provider_python import PyProvider - from providertestbase import ProviderTestCase -from qgis.PyQt.QtCore import QVariant, QDateTime, QDate, QTime +from utilities import compareWkt, unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_provider_shapefile.py b/tests/src/python/test_provider_shapefile.py index 4843570108c5..ea82f10cad3f 100644 --- a/tests/src/python/test_provider_shapefile.py +++ b/tests/src/python/test_provider_shapefile.py @@ -9,36 +9,37 @@ __date__ = '2015-04-23' __copyright__ = 'Copyright 2015, The QGIS Project' +import glob import os import re -import tempfile import shutil -import glob -import osgeo.gdal -import osgeo.ogr import sys +import tempfile +import osgeo.gdal +import osgeo.ogr from osgeo import gdal +from qgis.PyQt.QtCore import QVariant from qgis.core import ( + Qgis, QgsApplication, QgsDataProvider, - QgsSettings, QgsFeature, + QgsFeatureRequest, QgsField, QgsGeometry, - QgsVectorLayer, - QgsFeatureRequest, QgsProviderRegistry, QgsRectangle, + QgsSettings, QgsVectorDataProvider, - QgsWkbTypes, + QgsVectorLayer, QgsVectorLayerExporter, - Qgis + QgsWkbTypes, ) -from qgis.PyQt.QtCore import QVariant from qgis.testing import start_app, unittest -from utilities import unitTestDataPath + from providertestbase import ProviderTestCase +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_provider_spatialite.py b/tests/src/python/test_provider_spatialite.py index dc6e8cd0f7cd..eb0207bfd8fb 100644 --- a/tests/src/python/test_provider_spatialite.py +++ b/tests/src/python/test_provider_spatialite.py @@ -18,24 +18,26 @@ import qgis # NOQA from osgeo import ogr -from qgis.PyQt.QtCore import QVariant, QByteArray -from qgis.core import (Qgis, - QgsProviderRegistry, - QgsDataSourceUri, - QgsVectorLayer, - QgsVectorDataProvider, - QgsPointXY, - QgsFeature, - QgsGeometry, - QgsProject, - QgsFieldConstraints, - QgsVectorLayerUtils, - QgsSettings, - QgsDefaultValue, - QgsFeatureRequest, - QgsRectangle, - QgsVectorLayerExporter, - QgsWkbTypes) +from qgis.PyQt.QtCore import QByteArray, QVariant +from qgis.core import ( + Qgis, + QgsDataSourceUri, + QgsDefaultValue, + QgsFeature, + QgsFeatureRequest, + QgsFieldConstraints, + QgsGeometry, + QgsPointXY, + QgsProject, + QgsProviderRegistry, + QgsRectangle, + QgsSettings, + QgsVectorDataProvider, + QgsVectorLayer, + QgsVectorLayerExporter, + QgsVectorLayerUtils, + QgsWkbTypes, +) from qgis.testing import start_app, unittest from qgis.utils import spatialite_connect diff --git a/tests/src/python/test_provider_tabfile.py b/tests/src/python/test_provider_tabfile.py index 9927a683ec39..89fc0dea644a 100644 --- a/tests/src/python/test_provider_tabfile.py +++ b/tests/src/python/test_provider_tabfile.py @@ -14,8 +14,13 @@ import tempfile import osgeo.gdal # NOQA -from qgis.PyQt.QtCore import QDate, QTime, QDateTime, QVariant, QDir -from qgis.core import QgsVectorLayer, QgsFeatureRequest, QgsVectorDataProvider, QgsField +from qgis.PyQt.QtCore import QDate, QDateTime, QDir, QTime, QVariant +from qgis.core import ( + QgsFeatureRequest, + QgsField, + QgsVectorDataProvider, + QgsVectorLayer, +) from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_provider_virtual.py b/tests/src/python/test_provider_virtual.py index 85755cedf26e..dfdade0ff456 100644 --- a/tests/src/python/test_provider_virtual.py +++ b/tests/src/python/test_provider_virtual.py @@ -9,32 +9,30 @@ __date__ = '26/11/2015' __copyright__ = 'Copyright 2015, The QGIS Project' -import qgis # NOQA import os +import tempfile -from qgis.core import (QgsVectorLayer, - QgsField, - QgsFeature, - QgsFeatureRequest, - QgsGeometry, - QgsRectangle, - QgsVirtualLayerDefinition, - QgsWkbTypes, - QgsProject, - QgsVectorLayerJoinInfo, - QgsVectorFileWriter, - QgsVirtualLayerDefinitionUtils - ) - +import qgis # NOQA +from qgis.PyQt.QtCore import QTemporaryDir, QUrl, QVariant +from qgis.core import ( + QgsFeature, + QgsFeatureRequest, + QgsField, + QgsGeometry, + QgsProject, + QgsRectangle, + QgsVectorFileWriter, + QgsVectorLayer, + QgsVectorLayerJoinInfo, + QgsVirtualLayerDefinition, + QgsVirtualLayerDefinitionUtils, + QgsWkbTypes, +) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath - -from providertestbase import ProviderTestCase -from qgis.PyQt.QtCore import QUrl, QVariant, QTemporaryDir - from qgis.utils import spatialite_connect -import tempfile +from providertestbase import ProviderTestCase +from utilities import unitTestDataPath # Convenience instances in case you may need them start_app() diff --git a/tests/src/python/test_provider_wfs.py b/tests/src/python/test_provider_wfs.py index abfc414736fc..420575cf50ba 100644 --- a/tests/src/python/test_provider_wfs.py +++ b/tests/src/python/test_provider_wfs.py @@ -10,43 +10,45 @@ __copyright__ = 'Copyright 2016, Even Rouault' import hashlib +import http.server import os import re import shutil +import socketserver import tempfile -import http.server import threading -import socketserver # Needed on Qt 5 so that the serialization of XML is consistent among all executions os.environ['QT_HASH_SEED'] = '1' -from qgis.PyQt.QtCore import QCoreApplication, Qt, QObject, QDateTime, QEventLoop - +from providertestbase import ProviderTestCase from qgis.core import ( Qgis, - QgsWkbTypes, - QgsVectorLayer, - QgsFeature, - QgsGeometry, - QgsRectangle, - QgsPointXY, - QgsVectorDataProvider, - QgsFeatureRequest, QgsApplication, - QgsSettings, QgsExpression, - QgsExpressionContextUtils, QgsExpressionContext, QgsExpressionContextScope, + QgsExpressionContextUtils, + QgsFeature, + QgsFeatureRequest, + QgsGeometry, QgsMapLayerType, - QgsProviderRegistry + QgsPointXY, + QgsProviderRegistry, + QgsRectangle, + QgsSettings, + QgsVectorDataProvider, + QgsVectorLayer, + QgsWkbTypes, ) - -from qgis.testing import (start_app, - unittest - ) -from providertestbase import ProviderTestCase +from qgis.PyQt.QtCore import ( + QCoreApplication, + QDateTime, + QEventLoop, + QObject, + Qt, +) +from qgis.testing import start_app, unittest from utilities import compareWkt, unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_provider_wfs_gui.py b/tests/src/python/test_provider_wfs_gui.py index 0ef5a6ea571f..a30a0daf6612 100644 --- a/tests/src/python/test_provider_wfs_gui.py +++ b/tests/src/python/test_provider_wfs_gui.py @@ -10,15 +10,21 @@ __copyright__ = 'Copyright 2016, Even Rouault' import hashlib +import shutil import sys import tempfile -import shutil -from qgis.PyQt.QtCore import QCoreApplication, Qt, QEventLoop -from qgis.PyQt.QtWidgets import QApplication, QWidget, QTextEdit, QLineEdit, QDialogButtonBox, QComboBox +from qgis.PyQt.QtCore import QCoreApplication, QEventLoop, Qt from qgis.PyQt.QtTest import QTest - -from qgis.core import QgsProviderRegistry, QgsSettings +from qgis.PyQt.QtWidgets import ( + QApplication, + QComboBox, + QDialogButtonBox, + QLineEdit, + QTextEdit, + QWidget, +) +from qgis.core import QgsSettings from qgis.gui import QgsGui from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_python_repr.py b/tests/src/python/test_python_repr.py index 9f7c0100dccc..b8d9c9e2e033 100644 --- a/tests/src/python/test_python_repr.py +++ b/tests/src/python/test_python_repr.py @@ -14,55 +14,55 @@ import qgis # NOQA from PyQt5.QtCore import QVariant -from qgis.testing import unittest, start_app from qgis.core import ( - QgsGeometry, - QgsPoint, - QgsPointXY, + QgsAnnotationLayer, + QgsBookmark, QgsCircle, QgsCircularString, + QgsClassificationRange, QgsCompoundCurve, + QgsConditionalStyle, + QgsCoordinateReferenceSystem, + QgsCoordinateTransform, QgsCurvePolygon, + QgsDataSourceUri, + QgsDefaultValue, + QgsDoubleRange, QgsEllipse, - QgsLineString, - QgsMultiCurve, - QgsRectangle, + QgsError, QgsExpression, QgsField, - QgsError, - QgsMimeDataUtils, - QgsVector, - QgsVector3D, - QgsVectorLayer, - QgsReferencedPointXY, - QgsReferencedRectangle, - QgsCoordinateReferenceSystem, - QgsCoordinateTransform, - QgsProject, - QgsClassificationRange, - QgsBookmark, + QgsGeometry, + QgsIntRange, QgsLayoutMeasurement, QgsLayoutPoint, QgsLayoutSize, - QgsUnitTypes, - QgsConditionalStyle, - QgsTableCell, + QgsLineString, + QgsMeshLayer, + QgsMimeDataUtils, + QgsMultiCurve, + QgsPoint, + QgsPointCloudLayer, + QgsPointXY, + QgsProject, QgsProperty, - QgsVertexId, - QgsReferencedGeometry, QgsProviderRegistry, QgsRasterLayer, - QgsAnnotationLayer, - QgsPointCloudLayer, - QgsVectorTileLayer, - QgsMeshLayer, - QgsDataSourceUri, - QgsDoubleRange, - QgsIntRange, - QgsDefaultValue, + QgsRectangle, + QgsReferencedGeometry, + QgsReferencedPointXY, + QgsReferencedRectangle, + QgsRendererCategory, QgsRendererRange, - QgsRendererCategory + QgsTableCell, + QgsUnitTypes, + QgsVector, + QgsVector3D, + QgsVectorLayer, + QgsVectorTileLayer, + QgsVertexId, ) +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_python_utils.py b/tests/src/python/test_python_utils.py index e0dabeed5358..1fc93c236071 100644 --- a/tests/src/python/test_python_utils.py +++ b/tests/src/python/test_python_utils.py @@ -13,8 +13,8 @@ import os -from qgis.testing import unittest, start_app from qgis import utils +from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsaction.py b/tests/src/python/test_qgsaction.py index 5233650c4344..7cd2f07cd7b0 100644 --- a/tests/src/python/test_qgsaction.py +++ b/tests/src/python/test_qgsaction.py @@ -11,26 +11,20 @@ __date__ = '24/11/2021' __copyright__ = 'Copyright 2021, The QGIS Project' -import qgis # NOQA switch sip api +import os +from functools import partial +import qgis # NOQA switch sip api +from qgis.PyQt.QtCore import QTemporaryDir from qgis.core import ( - QgsExpressionContext, QgsAction, + QgsApplication, + QgsExpressionContext, QgsNetworkAccessManager, QgsNetworkRequestParameters, - QgsApplication, ) - -from qgis.PyQt.QtCore import QTemporaryDir - from qgis.testing import start_app, unittest -import os -import re -import time -import platform -from functools import partial - start_app() diff --git a/tests/src/python/test_qgsactionmanager.py b/tests/src/python/test_qgsactionmanager.py index 973147972f28..4cb60cdd5b86 100644 --- a/tests/src/python/test_qgsactionmanager.py +++ b/tests/src/python/test_qgsactionmanager.py @@ -11,24 +11,23 @@ __date__ = '28/05/2016' __copyright__ = 'Copyright 2016, The QGIS Project' -import qgis # NOQA switch sip api +import os +import platform +import time -from qgis.core import (QgsVectorLayer, - QgsFeature, - QgsActionManager, - QgsAction, - QgsExpressionContext, - QgsField, - QgsFields - ) +import qgis # NOQA switch sip api from qgis.PyQt.QtCore import QDir, QTemporaryFile, QUuid - +from qgis.core import ( + QgsAction, + QgsActionManager, + QgsExpressionContext, + QgsFeature, + QgsField, + QgsFields, + QgsVectorLayer, +) from qgis.testing import start_app, unittest -import os -import time -import platform - start_app() diff --git a/tests/src/python/test_qgsactionwidgetwrapper.py b/tests/src/python/test_qgsactionwidgetwrapper.py index 8a1e9660212f..4720b377a847 100644 --- a/tests/src/python/test_qgsactionwidgetwrapper.py +++ b/tests/src/python/test_qgsactionwidgetwrapper.py @@ -12,23 +12,12 @@ __copyright__ = 'Copyright 2021, The QGIS Project' import qgis # NOQA switch sip api - -from qgis.core import (QgsVectorLayer, - QgsFeature, - QgsAction, - ) -from qgis.PyQt.QtCore import QDir, QTemporaryFile, QUuid +from qgis.PyQt.QtCore import QUuid from qgis.PyQt.QtWidgets import QPushButton, QWidget -from qgis.PyQt.QtGui import QIcon - +from qgis.core import QgsAction, QgsVectorLayer from qgis.gui import QgsActionWidgetWrapper - from qgis.testing import start_app, unittest -import os -import time -import platform - start_app() from qgis.testing import QGISAPP diff --git a/tests/src/python/test_qgsaggregatecalculator.py b/tests/src/python/test_qgsaggregatecalculator.py index f9b0fe20e858..f85bff5891d3 100644 --- a/tests/src/python/test_qgsaggregatecalculator.py +++ b/tests/src/python/test_qgsaggregatecalculator.py @@ -12,19 +12,19 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsAggregateCalculator, - QgsVectorLayer, - QgsFeature, - QgsInterval, - QgsExpressionContext, - QgsExpressionContextScope, - QgsGeometry, - QgsFeatureRequest, - NULL - ) -from qgis.PyQt.QtCore import QDateTime, QDate, QTime -from qgis.testing import unittest, start_app +from qgis.PyQt.QtCore import QDate, QDateTime, QTime +from qgis.core import ( + NULL, + QgsAggregateCalculator, + QgsExpressionContext, + QgsExpressionContextScope, + QgsFeature, + QgsFeatureRequest, + QgsGeometry, + QgsInterval, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest from utilities import compareWkt diff --git a/tests/src/python/test_qgsaggregatemappingwidget.py b/tests/src/python/test_qgsaggregatemappingwidget.py index c2dd08745ec7..1922e9be9254 100644 --- a/tests/src/python/test_qgsaggregatemappingwidget.py +++ b/tests/src/python/test_qgsaggregatemappingwidget.py @@ -14,25 +14,15 @@ # This will get replaced with a git SHA1 when you do a git archive __revision__ = '$Format:%H$' -from qgis.core import ( - QgsFields, - QgsField, - QgsFieldConstraints, -) -from qgis.gui import ( - QgsAggregateMappingWidget, - QgsAggregateMappingModel, -) from qgis.PyQt.Qt import Qt from qgis.PyQt.QtCore import ( QCoreApplication, - QVariant, - QModelIndex, QItemSelectionModel, + QModelIndex, + QVariant, ) -from qgis.PyQt.QtGui import ( - QColor -) +from qgis.core import QgsField, QgsFields +from qgis.gui import QgsAggregateMappingModel, QgsAggregateMappingWidget from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsalignmentcombobox.py b/tests/src/python/test_qgsalignmentcombobox.py index 2f0e9b17826f..16402f57a91c 100644 --- a/tests/src/python/test_qgsalignmentcombobox.py +++ b/tests/src/python/test_qgsalignmentcombobox.py @@ -12,11 +12,9 @@ __copyright__ = 'Copyright 2019, The QGIS Project' import qgis # NOQA - from qgis.PyQt.QtCore import Qt -from qgis.gui import QgsAlignmentComboBox - from qgis.PyQt.QtTest import QSignalSpy +from qgis.gui import QgsAlignmentComboBox from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsanimatedmarkersymbollayer.py b/tests/src/python/test_qgsanimatedmarkersymbollayer.py index 7a2cd9c68115..a76c950ed663 100644 --- a/tests/src/python/test_qgsanimatedmarkersymbollayer.py +++ b/tests/src/python/test_qgsanimatedmarkersymbollayer.py @@ -19,25 +19,23 @@ __date__ = 'April 2022' __copyright__ = '(C) 2022, Nyall Dawson' -import qgis # NOQA - import os -from utilities import unitTestDataPath +import qgis # NOQA from qgis.PyQt.QtCore import QDir, QSize - from qgis.core import ( + QgsAnimatedMarkerSymbolLayer, QgsMapSettings, - QgsRenderChecker, - QgsVectorLayer, - QgsRectangle, + QgsMarkerSymbol, QgsMultiRenderChecker, + QgsRectangle, + QgsRenderChecker, QgsSingleSymbolRenderer, - QgsAnimatedMarkerSymbolLayer, - QgsMarkerSymbol + QgsVectorLayer, ) +from qgis.testing import start_app, unittest -from qgis.testing import unittest, start_app +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsannotation.py b/tests/src/python/test_qgsannotation.py index af49ea9b0b2c..c178c4a982d1 100644 --- a/tests/src/python/test_qgsannotation.py +++ b/tests/src/python/test_qgsannotation.py @@ -12,37 +12,31 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsTextAnnotation, - QgsSvgAnnotation, - QgsHtmlAnnotation, - QgsMapSettings, - QgsRenderContext, - QgsCoordinateReferenceSystem, - QgsRectangle, - QgsMultiRenderChecker, - QgsRenderChecker, - QgsVectorLayer, - QgsFeature, - QgsMargins, - QgsFillSymbol, - QgsProject, - QgsLayout, - QgsLayoutItemMap, - QgsPointXY) +from qgis.PyQt.QtCore import QDir, QPointF, QRectF, QSize, QSizeF +from qgis.PyQt.QtGui import QColor, QImage, QPainter, QTextDocument +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsFeature, + QgsFillSymbol, + QgsHtmlAnnotation, + QgsLayout, + QgsLayoutItemMap, + QgsMapSettings, + QgsMargins, + QgsMultiRenderChecker, + QgsPointXY, + QgsProject, + QgsRectangle, + QgsRenderChecker, + QgsRenderContext, + QgsSvgAnnotation, + QgsTextAnnotation, + QgsVectorLayer, +) from qgis.gui import QgsFormAnnotation -from qgis.PyQt.QtCore import (QDir, - QPointF, - QSize, - QSizeF, - QRectF) -from qgis.PyQt.QtGui import (QColor, - QPainter, - QImage, - QTextDocument) -from qgslayoutchecker import QgsLayoutChecker - from qgis.testing import start_app, unittest + +from qgslayoutchecker import QgsLayoutChecker from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsannotationitemeditoperation.py b/tests/src/python/test_qgsannotationitemeditoperation.py index 489b2ff43ef6..2e147dc9047e 100644 --- a/tests/src/python/test_qgsannotationitemeditoperation.py +++ b/tests/src/python/test_qgsannotationitemeditoperation.py @@ -13,13 +13,12 @@ import qgis # NOQA from qgis.core import ( - QgsAnnotationItemEditOperationMoveNode, + QgsAnnotationItemEditOperationAddNode, QgsAnnotationItemEditOperationDeleteNode, + QgsAnnotationItemEditOperationMoveNode, QgsAnnotationItemEditOperationTranslateItem, - QgsAnnotationItemEditOperationAddNode, - QgsVertexId, QgsPoint, - QgsPointXY + QgsVertexId, ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsannotationitemnode.py b/tests/src/python/test_qgsannotationitemnode.py index d7f37f2de2af..dbbd03940cd7 100644 --- a/tests/src/python/test_qgsannotationitemnode.py +++ b/tests/src/python/test_qgsannotationitemnode.py @@ -12,12 +12,7 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA -from qgis.core import ( - QgsAnnotationItemNode, - QgsPointXY, - Qgis, - QgsVertexId -) +from qgis.core import Qgis, QgsAnnotationItemNode, QgsPointXY, QgsVertexId from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsannotationlayer.py b/tests/src/python/test_qgsannotationlayer.py index 1140d4631f6d..b5085407f531 100644 --- a/tests/src/python/test_qgsannotationlayer.py +++ b/tests/src/python/test_qgsannotationlayer.py @@ -12,43 +12,39 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA -from qgis.PyQt.QtCore import (QSize, - QDir, - QTemporaryDir) -from qgis.PyQt.QtGui import (QImage, - QPainter, - QColor) +from qgis.PyQt.QtCore import QDir, QSize, QTemporaryDir +from qgis.PyQt.QtGui import QColor, QImage, QPainter from qgis.PyQt.QtXml import QDomDocument -from qgis.core import (QgsMapSettings, - QgsCoordinateTransform, - QgsProject, - QgsPoint, - QgsCoordinateReferenceSystem, - QgsFillSymbol, - QgsRenderChecker, - QgsReadWriteContext, - QgsRenderContext, - QgsAnnotationPolygonItem, - QgsRectangle, - QgsLineString, - QgsPolygon, - QgsAnnotationLayer, - QgsAnnotationLineItem, - QgsAnnotationMarkerItem, - QgsLineSymbol, - QgsMarkerSymbol, - QgsMapRendererSequentialJob, - QgsMapRendererParallelJob, - QgsGeometry, - QgsAnnotationItemEditOperationMoveNode, - QgsVertexId, - QgsPointXY, - Qgis, - QgsLayerNotesUtils - ) +from qgis.core import ( + Qgis, + QgsAnnotationItemEditOperationMoveNode, + QgsAnnotationLayer, + QgsAnnotationLineItem, + QgsAnnotationMarkerItem, + QgsAnnotationPolygonItem, + QgsCoordinateReferenceSystem, + QgsCoordinateTransform, + QgsFillSymbol, + QgsGeometry, + QgsLayerNotesUtils, + QgsLineString, + QgsLineSymbol, + QgsMapRendererParallelJob, + QgsMapRendererSequentialJob, + QgsMapSettings, + QgsMarkerSymbol, + QgsPoint, + QgsPolygon, + QgsProject, + QgsReadWriteContext, + QgsRectangle, + QgsRenderChecker, + QgsRenderContext, + QgsVertexId, +) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath, compareWkt +from utilities import compareWkt, unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsannotationlineitem.py b/tests/src/python/test_qgsannotationlineitem.py index 81b6d870f159..2699759d7dd5 100644 --- a/tests/src/python/test_qgsannotationlineitem.py +++ b/tests/src/python/test_qgsannotationlineitem.py @@ -12,38 +12,34 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtCore import (QSize, - QDir) -from qgis.PyQt.QtGui import (QImage, - QPainter, - QColor, - QTransform) -from qgis.core import (QgsMapSettings, - QgsCoordinateTransform, - QgsProject, - QgsPoint, - QgsCoordinateReferenceSystem, - QgsLineSymbol, - QgsRenderChecker, - QgsReadWriteContext, - QgsRenderContext, - QgsAnnotationLineItem, - QgsRectangle, - QgsLineString, - QgsCircularString, - QgsAnnotationItemNode, - QgsPointXY, - Qgis, - QgsVertexId, - QgsAnnotationItemEditOperationMoveNode, - QgsAnnotationItemEditOperationDeleteNode, - QgsAnnotationItemEditOperationTranslateItem, - QgsAnnotationItemEditOperationAddNode - ) +from qgis.PyQt.QtCore import QDir, QSize +from qgis.PyQt.QtGui import QColor, QImage, QPainter from qgis.PyQt.QtXml import QDomDocument - +from qgis.core import ( + Qgis, + QgsAnnotationItemEditOperationAddNode, + QgsAnnotationItemEditOperationDeleteNode, + QgsAnnotationItemEditOperationMoveNode, + QgsAnnotationItemEditOperationTranslateItem, + QgsAnnotationItemNode, + QgsAnnotationLineItem, + QgsCircularString, + QgsCoordinateReferenceSystem, + QgsCoordinateTransform, + QgsLineString, + QgsLineSymbol, + QgsMapSettings, + QgsPoint, + QgsPointXY, + QgsProject, + QgsReadWriteContext, + QgsRectangle, + QgsRenderChecker, + QgsRenderContext, + QgsVertexId, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsannotationmarkeritem.py b/tests/src/python/test_qgsannotationmarkeritem.py index e209705989f7..bc323cb7d162 100644 --- a/tests/src/python/test_qgsannotationmarkeritem.py +++ b/tests/src/python/test_qgsannotationmarkeritem.py @@ -12,36 +12,32 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtCore import (QSize, - QDir) -from qgis.PyQt.QtGui import (QImage, - QPainter, - QColor, - QTransform) -from qgis.core import (QgsMapSettings, - QgsCoordinateTransform, - QgsProject, - QgsPoint, - QgsCoordinateReferenceSystem, - QgsMarkerSymbol, - QgsRenderChecker, - QgsReadWriteContext, - QgsRenderContext, - QgsAnnotationMarkerItem, - QgsRectangle, - QgsAnnotationItemNode, - Qgis, - QgsPointXY, - QgsVertexId, - QgsAnnotationItemEditOperationMoveNode, - QgsAnnotationItemEditOperationDeleteNode, - QgsAnnotationItemEditOperationTranslateItem, - QgsAnnotationItemEditOperationAddNode - ) +from qgis.PyQt.QtCore import QDir, QSize +from qgis.PyQt.QtGui import QColor, QImage, QPainter from qgis.PyQt.QtXml import QDomDocument - +from qgis.core import ( + Qgis, + QgsAnnotationItemEditOperationAddNode, + QgsAnnotationItemEditOperationDeleteNode, + QgsAnnotationItemEditOperationMoveNode, + QgsAnnotationItemEditOperationTranslateItem, + QgsAnnotationItemNode, + QgsAnnotationMarkerItem, + QgsCoordinateReferenceSystem, + QgsCoordinateTransform, + QgsMapSettings, + QgsMarkerSymbol, + QgsPoint, + QgsPointXY, + QgsProject, + QgsReadWriteContext, + QgsRectangle, + QgsRenderChecker, + QgsRenderContext, + QgsVertexId, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsannotationpointtextitem.py b/tests/src/python/test_qgsannotationpointtextitem.py index 2991383d74a7..ad414c75252c 100644 --- a/tests/src/python/test_qgsannotationpointtextitem.py +++ b/tests/src/python/test_qgsannotationpointtextitem.py @@ -12,39 +12,33 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtCore import (QSize, - QDir, - Qt) -from qgis.PyQt.QtGui import (QImage, - QPainter, - QColor, - QTransform) -from qgis.core import (QgsMapSettings, - QgsCoordinateTransform, - QgsProject, - QgsPointXY, - QgsCoordinateReferenceSystem, - QgsMarkerSymbol, - QgsRenderChecker, - QgsReadWriteContext, - QgsRenderContext, - QgsAnnotationPointTextItem, - QgsRectangle, - QgsTextFormat, - QgsAnnotationItemNode, - Qgis, - QgsVertexId, - QgsAnnotationItemEditOperationMoveNode, - QgsAnnotationItemEditOperationDeleteNode, - QgsAnnotationItemEditOperationAddNode, - QgsAnnotationItemEditOperationTranslateItem, - QgsPoint - ) +from qgis.PyQt.QtCore import QDir, QSize, Qt +from qgis.PyQt.QtGui import QColor, QImage, QPainter from qgis.PyQt.QtXml import QDomDocument - +from qgis.core import ( + Qgis, + QgsAnnotationItemEditOperationAddNode, + QgsAnnotationItemEditOperationDeleteNode, + QgsAnnotationItemEditOperationMoveNode, + QgsAnnotationItemEditOperationTranslateItem, + QgsAnnotationItemNode, + QgsAnnotationPointTextItem, + QgsCoordinateReferenceSystem, + QgsCoordinateTransform, + QgsMapSettings, + QgsPoint, + QgsPointXY, + QgsProject, + QgsReadWriteContext, + QgsRectangle, + QgsRenderChecker, + QgsRenderContext, + QgsTextFormat, + QgsVertexId, +) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath, getTestFont + +from utilities import getTestFont, unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsannotationpolygonitem.py b/tests/src/python/test_qgsannotationpolygonitem.py index 1e75bce2925d..aecbe990709a 100644 --- a/tests/src/python/test_qgsannotationpolygonitem.py +++ b/tests/src/python/test_qgsannotationpolygonitem.py @@ -12,40 +12,36 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtCore import (QSize, - QDir) -from qgis.PyQt.QtGui import (QImage, - QPainter, - QColor, - QTransform) -from qgis.core import (QgsMapSettings, - QgsCoordinateTransform, - QgsProject, - QgsPoint, - QgsCoordinateReferenceSystem, - QgsFillSymbol, - QgsRenderChecker, - QgsReadWriteContext, - QgsRenderContext, - QgsAnnotationPolygonItem, - QgsRectangle, - QgsLineString, - QgsPolygon, - QgsCurvePolygon, - QgsCircularString, - QgsAnnotationItemNode, - Qgis, - QgsPointXY, - QgsVertexId, - QgsAnnotationItemEditOperationMoveNode, - QgsAnnotationItemEditOperationDeleteNode, - QgsAnnotationItemEditOperationTranslateItem, - QgsAnnotationItemEditOperationAddNode - ) +from qgis.PyQt.QtCore import QDir, QSize +from qgis.PyQt.QtGui import QColor, QImage, QPainter from qgis.PyQt.QtXml import QDomDocument - +from qgis.core import ( + Qgis, + QgsAnnotationItemEditOperationAddNode, + QgsAnnotationItemEditOperationDeleteNode, + QgsAnnotationItemEditOperationMoveNode, + QgsAnnotationItemEditOperationTranslateItem, + QgsAnnotationItemNode, + QgsAnnotationPolygonItem, + QgsCircularString, + QgsCoordinateReferenceSystem, + QgsCoordinateTransform, + QgsCurvePolygon, + QgsFillSymbol, + QgsLineString, + QgsMapSettings, + QgsPoint, + QgsPointXY, + QgsPolygon, + QgsProject, + QgsReadWriteContext, + QgsRectangle, + QgsRenderChecker, + QgsRenderContext, + QgsVertexId, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsapplication.py b/tests/src/python/test_qgsapplication.py index 8b04021443ef..0e7d98282f30 100644 --- a/tests/src/python/test_qgsapplication.py +++ b/tests/src/python/test_qgsapplication.py @@ -10,8 +10,8 @@ __copyright__ = 'Copyright 2012, The QGIS Project' import qgis # NOQA -from qgis.testing import start_app, unittest +from qgis.testing import start_app, unittest QGISAPP = start_app() diff --git a/tests/src/python/test_qgsappstartup.py b/tests/src/python/test_qgsappstartup.py index 3c778ca1a5e7..88db633a673c 100644 --- a/tests/src/python/test_qgsappstartup.py +++ b/tests/src/python/test_qgsappstartup.py @@ -11,17 +11,18 @@ __date__ = '17/07/2013' __copyright__ = 'Copyright 2013, The QGIS Project' -import sys -import os +import errno import glob +import os import re -import time import shutil import subprocess +import sys import tempfile -import errno +import time from qgis.testing import unittest + from utilities import unitTestDataPath print('CTEST_FULL_OUTPUT') diff --git a/tests/src/python/test_qgsarcgisportalutils.py b/tests/src/python/test_qgsarcgisportalutils.py index f18bc6853342..a691d357531a 100644 --- a/tests/src/python/test_qgsarcgisportalutils.py +++ b/tests/src/python/test_qgsarcgisportalutils.py @@ -16,13 +16,8 @@ import tempfile from qgis.PyQt.QtCore import QCoreApplication, QObject -from qgis.core import (QgsArcGisPortalUtils, - QgsApplication, - QgsSettings - ) -from qgis.testing import (start_app, - unittest - ) +from qgis.core import QgsApplication, QgsArcGisPortalUtils, QgsSettings +from qgis.testing import start_app, unittest def sanitize(endpoint, x): diff --git a/tests/src/python/test_qgsarcgisrestutils.py b/tests/src/python/test_qgsarcgisrestutils.py index 6820f29cf42f..9be64fe3c5f5 100644 --- a/tests/src/python/test_qgsarcgisrestutils.py +++ b/tests/src/python/test_qgsarcgisrestutils.py @@ -12,26 +12,20 @@ __copyright__ = 'Copyright 2022, The QGIS Project' import qgis # NOQA -from qgis.PyQt.QtCore import ( - Qt, - QVariant, - QDate, - QTime, - QDateTime, - QTimeZone -) +from qgis.PyQt.QtCore import QDate, QDateTime, Qt, QTime, QTimeZone, QVariant from qgis.core import ( - QgsGeometry, + NULL, + QgsArcGisRestContext, QgsArcGisRestUtils, QgsCoordinateReferenceSystem, - QgsFields, + QgsFeature, QgsField, QgsFieldConstraints, - QgsFeature, - QgsArcGisRestContext, - NULL + QgsFields, + QgsGeometry, ) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsarrowsymbollayer.py b/tests/src/python/test_qgsarrowsymbollayer.py index 9e4f6589ddfc..80fc9f49dd45 100644 --- a/tests/src/python/test_qgsarrowsymbollayer.py +++ b/tests/src/python/test_qgsarrowsymbollayer.py @@ -19,34 +19,32 @@ __date__ = 'March 2016' __copyright__ = '(C) 2016, Hugo Mercier' -import qgis # NOQA - import os -from qgis.PyQt.QtCore import QSize, QDir -from qgis.PyQt.QtGui import QColor, QPainter, QImage - +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QSize +from qgis.PyQt.QtGui import QColor, QImage, QPainter from qgis.core import ( - QgsVectorLayer, - QgsSingleSymbolRenderer, - QgsLineSymbol, - QgsFillSymbol, - QgsProject, - QgsRectangle, QgsArrowSymbolLayer, + QgsFeature, + QgsFillSymbol, + QgsGeometry, + QgsLineSymbol, + QgsMapSettings, QgsMultiRenderChecker, + QgsProject, QgsProperty, - QgsSymbolLayer, - QgsMapSettings, - QgsSymbol, - QgsGeometry, - QgsFeature, + QgsRectangle, + QgsRenderChecker, QgsRenderContext, - QgsRenderChecker + QgsSingleSymbolRenderer, + QgsSymbol, + QgsSymbolLayer, + QgsVectorLayer, ) - from qgis.testing import start_app, unittest from qgis.testing.mocked import get_iface + from utilities import unitTestDataPath # Convenience instances in case you may need them diff --git a/tests/src/python/test_qgsattributeeditoraction.py b/tests/src/python/test_qgsattributeeditoraction.py index 75cb20f23ab9..5bc031d73960 100644 --- a/tests/src/python/test_qgsattributeeditoraction.py +++ b/tests/src/python/test_qgsattributeeditoraction.py @@ -12,24 +12,16 @@ __copyright__ = 'Copyright 2021, The QGIS Project' import qgis # NOQA switch sip api - -from qgis.core import (QgsVectorLayer, - QgsProject, - QgsFeature, - QgsAction, - QgsAttributeEditorAction, - QgsAttributeEditorContainer, - ) -from qgis.PyQt.QtCore import QDir, QTemporaryFile, QUuid -from qgis.PyQt.QtWidgets import QPushButton, QWidget -from qgis.PyQt.QtGui import QIcon - +from qgis.PyQt.QtCore import QUuid +from qgis.core import ( + QgsAction, + QgsAttributeEditorAction, + QgsAttributeEditorContainer, + QgsProject, + QgsVectorLayer, +) from qgis.testing import start_app, unittest -import os -import time -import platform - start_app() from qgis.testing import QGISAPP diff --git a/tests/src/python/test_qgsattributeform.py b/tests/src/python/test_qgsattributeform.py index 4de57deb22e9..ec0197bbc624 100644 --- a/tests/src/python/test_qgsattributeform.py +++ b/tests/src/python/test_qgsattributeform.py @@ -13,23 +13,23 @@ __date__ = '2019-06-06' __copyright__ = 'Copyright 2019, The QGIS Project' -from qgis.testing import start_app, unittest +from qgis.PyQt.QtCore import QVariant from qgis.core import ( - QgsVectorLayer, - QgsFeature, - QgsEditorWidgetSetup, - QgsEditFormConfig, QgsDefaultValue, - QgsField + QgsEditFormConfig, + QgsEditorWidgetSetup, + QgsFeature, + QgsField, + QgsVectorLayer, ) from qgis.gui import ( + QgsAttributeEditorContext, QgsAttributeForm, + QgsFilterLineEdit, QgsGui, QgsMapCanvas, - QgsAttributeEditorContext, - QgsFilterLineEdit ) -from qgis.PyQt.QtCore import QVariant +from qgis.testing import start_app, unittest QGISAPP = start_app() diff --git a/tests/src/python/test_qgsattributeformeditorwidget.py b/tests/src/python/test_qgsattributeformeditorwidget.py index b132105f8ca2..da2e3274c741 100644 --- a/tests/src/python/test_qgsattributeformeditorwidget.py +++ b/tests/src/python/test_qgsattributeformeditorwidget.py @@ -10,17 +10,16 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - -from qgis.gui import (QgsSearchWidgetWrapper, - QgsAttributeFormEditorWidget, - QgsDefaultSearchWidgetWrapper, - QgsAttributeForm, - QgsSearchWidgetToolButton, - QgsGui - ) -from qgis.core import (QgsVectorLayer) -from qgis.PyQt.QtWidgets import QWidget, QDateTimeEdit -from qgis.PyQt.QtCore import QDateTime, QDate, QTime +from qgis.PyQt.QtCore import QDate, QDateTime, QTime +from qgis.PyQt.QtWidgets import QDateTimeEdit, QWidget +from qgis.core import QgsVectorLayer +from qgis.gui import ( + QgsAttributeForm, + QgsAttributeFormEditorWidget, + QgsDefaultSearchWidgetWrapper, + QgsGui, + QgsSearchWidgetWrapper, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsattributetablemodel.py b/tests/src/python/test_qgsattributetablemodel.py index d39ba5a57999..8ad06a54e2b6 100644 --- a/tests/src/python/test_qgsattributetablemodel.py +++ b/tests/src/python/test_qgsattributetablemodel.py @@ -12,34 +12,26 @@ import os -from qgis.gui import ( - QgsAttributeTableModel, - QgsEditorWidgetFactory, - QgsGui -) +from qgis.PyQt.QtCore import QSortFilterProxyModel, Qt, QTemporaryDir, QVariant +from qgis.PyQt.QtGui import QColor +from qgis.PyQt.QtTest import QSignalSpy from qgis.core import ( - QgsProject, Qgis, + QgsConditionalStyle, QgsFeature, + QgsFeatureRequest, + QgsField, + QgsFields, QgsGeometry, + QgsMemoryProviderUtils, QgsPointXY, + QgsProject, QgsVectorLayer, QgsVectorLayerCache, - QgsConditionalStyle, QgsVectorLayerExporter, - QgsMemoryProviderUtils, - QgsField, - QgsFields, - QgsWkbTypes, - QgsFeatureRequest ) -from qgis.PyQt.QtCore import Qt, QTemporaryDir, QVariant, QSortFilterProxyModel -from qgis.PyQt.QtGui import QColor -from qgis.PyQt.QtTest import QSignalSpy - -from qgis.testing import (start_app, - unittest - ) +from qgis.gui import QgsAttributeTableModel, QgsEditorWidgetFactory, QgsGui +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsauthbasicmethod.py b/tests/src/python/test_qgsauthbasicmethod.py index 29c05d655dac..0828417f1f76 100644 --- a/tests/src/python/test_qgsauthbasicmethod.py +++ b/tests/src/python/test_qgsauthbasicmethod.py @@ -9,14 +9,17 @@ (at your option) any later version. """ +import base64 import os import tempfile -import base64 -from qgis.core import QgsApplication, QgsAuthManager, QgsAuthMethodConfig, QgsNetworkAccessManager from qgis.PyQt.QtCore import QFileInfo, QUrl -from qgis.testing import start_app, unittest from qgis.PyQt.QtNetwork import QNetworkRequest +from qgis.core import ( + QgsApplication, + QgsAuthMethodConfig, +) +from qgis.testing import start_app, unittest AUTHDBDIR = tempfile.mkdtemp() os.environ['QGIS_AUTH_DB_DIR_PATH'] = AUTHDBDIR diff --git a/tests/src/python/test_qgsauthsystem.py b/tests/src/python/test_qgsauthsystem.py index 49caab11b8d1..eb6645c9a51c 100644 --- a/tests/src/python/test_qgsauthsystem.py +++ b/tests/src/python/test_qgsauthsystem.py @@ -14,12 +14,19 @@ import os import tempfile -from qgis.core import QgsAuthCertUtils, QgsPkiBundle, QgsAuthMethodConfig, QgsAuthMethod, QgsAuthConfigSslServer, QgsApplication -from qgis.gui import QgsAuthEditorWidgets from qgis.PyQt.QtCore import QFileInfo, qDebug -from qgis.PyQt.QtNetwork import QSsl, QSslError, QSslCertificate, QSslSocket +from qgis.PyQt.QtNetwork import QSsl, QSslCertificate, QSslError, QSslSocket from qgis.PyQt.QtTest import QTest from qgis.PyQt.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout +from qgis.core import ( + QgsApplication, + QgsAuthCertUtils, + QgsAuthConfigSslServer, + QgsAuthMethod, + QgsAuthMethodConfig, + QgsPkiBundle, +) +from qgis.gui import QgsAuthEditorWidgets from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsauxiliarystorage.py b/tests/src/python/test_qgsauxiliarystorage.py index 74cac9e7e1e3..7a09e8ca27b4 100644 --- a/tests/src/python/test_qgsauxiliarystorage.py +++ b/tests/src/python/test_qgsauxiliarystorage.py @@ -9,32 +9,34 @@ __date__ = '06/09/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA - import os +import qgis # NOQA from qgis.PyQt.QtCore import QTemporaryFile, QVariant -from qgis.core import (QgsAuxiliaryStorage, - QgsAuxiliaryLayer, - QgsVectorLayer, - QgsFeature, - QgsGeometry, - QgsPropertyDefinition, - QgsProperty, - QgsProject, - QgsProjectArchive, - QgsFeatureRequest, - QgsPalLayerSettings, - QgsSymbolLayer, - QgsVectorLayerSimpleLabeling, - QgsField, - QgsCallout, - QgsSimpleLineCallout, - NULL, - QgsDiagramLayerSettings, - QgsSingleCategoryDiagramRenderer) +from qgis.core import ( + NULL, + QgsAuxiliaryLayer, + QgsAuxiliaryStorage, + QgsCallout, + QgsDiagramLayerSettings, + QgsFeature, + QgsFeatureRequest, + QgsField, + QgsGeometry, + QgsPalLayerSettings, + QgsProject, + QgsProjectArchive, + QgsProperty, + QgsPropertyDefinition, + QgsSimpleLineCallout, + QgsSingleCategoryDiagramRenderer, + QgsSymbolLayer, + QgsVectorLayer, + QgsVectorLayerSimpleLabeling, +) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath, writeShape + +from utilities import writeShape start_app() diff --git a/tests/src/python/test_qgsbabelgpsformat.py b/tests/src/python/test_qgsbabelgpsformat.py index 15b75b79305e..273fe6e32100 100644 --- a/tests/src/python/test_qgsbabelgpsformat.py +++ b/tests/src/python/test_qgsbabelgpsformat.py @@ -10,14 +10,14 @@ __copyright__ = 'Copyright 2021, The QGIS Project' import qgis # NOQA - from qgis.PyQt.QtCore import QCoreApplication from qgis.core import ( - Qgis, QgsSettings, - QgsBabelSimpleImportFormat, - QgsBabelGpsDeviceFormat, + Qgis, QgsApplication, - QgsBabelFormatRegistry + QgsBabelFormatRegistry, + QgsBabelGpsDeviceFormat, + QgsBabelSimpleImportFormat, + QgsSettings, ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsbearingutils.py b/tests/src/python/test_qgsbearingutils.py index 37a934e04886..0deaf3eb3da5 100644 --- a/tests/src/python/test_qgsbearingutils.py +++ b/tests/src/python/test_qgsbearingutils.py @@ -11,15 +11,14 @@ import qgis # NOQA switch sip api -from qgis.core import (QgsBearingUtils, - QgsCoordinateReferenceSystem, - QgsCoordinateTransformContext, - QgsPointXY - ) - +from qgis.core import ( + QgsBearingUtils, + QgsCoordinateReferenceSystem, + QgsCoordinateTransformContext, + QgsPointXY, +) from qgis.testing import start_app, unittest - start_app() diff --git a/tests/src/python/test_qgsbinarywidget.py b/tests/src/python/test_qgsbinarywidget.py index de671e197a43..926ba2f6f2c8 100644 --- a/tests/src/python/test_qgsbinarywidget.py +++ b/tests/src/python/test_qgsbinarywidget.py @@ -10,9 +10,8 @@ __copyright__ = 'Copyright 2018, The QGIS Project' import qgis # NOQA - from qgis.PyQt.QtCore import QByteArray -from qgis.core import QgsFeature, QgsGeometry, QgsPointXY, QgsVectorLayer, NULL +from qgis.core import NULL, QgsFeature, QgsGeometry, QgsPointXY, QgsVectorLayer from qgis.gui import QgsGui from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsblendmodes.py b/tests/src/python/test_qgsblendmodes.py index 34f3145d0a18..35caf58c6ad0 100644 --- a/tests/src/python/test_qgsblendmodes.py +++ b/tests/src/python/test_qgsblendmodes.py @@ -19,25 +19,22 @@ __date__ = 'May 2013' __copyright__ = '(C) 2013, Nyall Dawson, Massimo Endrighi' -import qgis # NOQA - import os +import qgis # NOQA from qgis.PyQt.QtCore import QSize -from qgis.PyQt.QtGui import QPainter, QColor - -from qgis.core import (QgsVectorLayer, - QgsVectorSimplifyMethod, - QgsProject, - QgsMultiRenderChecker, - QgsRasterLayer, - QgsMultiBandColorRenderer, - QgsRectangle, - QgsMapSettings - ) - +from qgis.PyQt.QtGui import QColor, QPainter +from qgis.core import ( + QgsMapSettings, + QgsMultiBandColorRenderer, + QgsMultiRenderChecker, + QgsProject, + QgsRasterLayer, + QgsRectangle, + QgsVectorLayer, + QgsVectorSimplifyMethod, +) from qgis.testing import unittest - from qgis.testing.mocked import get_iface from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsblockingnetworkrequest.py b/tests/src/python/test_qgsblockingnetworkrequest.py index 775a62034b27..294106637b25 100644 --- a/tests/src/python/test_qgsblockingnetworkrequest.py +++ b/tests/src/python/test_qgsblockingnetworkrequest.py @@ -11,15 +11,13 @@ __copyright__ = 'Copyright 2018, The QGIS Project' import qgis # NOQA - -import mockedwebserver -import os -from qgis.testing import unittest, start_app -from qgis.core import QgsBlockingNetworkRequest -from utilities import unitTestDataPath from qgis.PyQt.QtCore import QUrl -from qgis.PyQt.QtTest import QSignalSpy from qgis.PyQt.QtNetwork import QNetworkReply, QNetworkRequest +from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import QgsBlockingNetworkRequest +from qgis.testing import start_app, unittest + +import mockedwebserver app = start_app() diff --git a/tests/src/python/test_qgsblockingprocess.py b/tests/src/python/test_qgsblockingprocess.py index 6469998d822d..630046dd93f3 100644 --- a/tests/src/python/test_qgsblockingprocess.py +++ b/tests/src/python/test_qgsblockingprocess.py @@ -24,11 +24,8 @@ import qgis # NOQA from qgis.PyQt.QtCore import QProcess -from qgis.core import ( - QgsBlockingProcess, - QgsFeedback -) -from qgis.testing import unittest, start_app +from qgis.core import QgsBlockingProcess, QgsFeedback +from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsbookmarkmanager.py b/tests/src/python/test_qgsbookmarkmanager.py index 4519d31bc4ec..f8fd4102b1c8 100644 --- a/tests/src/python/test_qgsbookmarkmanager.py +++ b/tests/src/python/test_qgsbookmarkmanager.py @@ -9,24 +9,25 @@ __date__ = '02/09/2019' __copyright__ = 'Copyright 2019, The QGIS Project' -import qgis # NOQA import os -from qgis.PyQt.QtCore import QCoreApplication, QLocale, QTemporaryDir, QEvent - -from qgis.core import (QgsBookmark, - QgsBookmarkManager, - QgsProject, - QgsReferencedRectangle, - QgsRectangle, - QgsCoordinateReferenceSystem, - QgsSettings, - QgsApplication) - +import qgis # NOQA +from qgis.PyQt.QtCore import QCoreApplication, QEvent, QLocale, QTemporaryDir +from qgis.PyQt.QtTest import QSignalSpy +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsApplication, + QgsBookmark, + QgsBookmarkManager, + QgsCoordinateReferenceSystem, + QgsProject, + QgsRectangle, + QgsReferencedRectangle, + QgsSettings, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath -from qgis.PyQt.QtXml import QDomDocument -from qgis.PyQt.QtTest import QSignalSpy start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsbookmarkmodel.py b/tests/src/python/test_qgsbookmarkmodel.py index f041467f29bb..5a31aedf4caa 100644 --- a/tests/src/python/test_qgsbookmarkmodel.py +++ b/tests/src/python/test_qgsbookmarkmodel.py @@ -10,19 +10,19 @@ __copyright__ = 'Copyright 2019, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtCore import Qt, QCoreApplication, QLocale - -from qgis.core import (QgsBookmark, - QgsBookmarkManager, - QgsBookmarkManagerModel, - QgsProject, - QgsReferencedRectangle, - QgsRectangle, - QgsCoordinateReferenceSystem, - QgsSettings) - +from qgis.PyQt.QtCore import QCoreApplication, QLocale, Qt +from qgis.core import ( + QgsBookmark, + QgsBookmarkManager, + QgsBookmarkManagerModel, + QgsCoordinateReferenceSystem, + QgsProject, + QgsRectangle, + QgsReferencedRectangle, + QgsSettings, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsbox3d.py b/tests/src/python/test_qgsbox3d.py index ee06008eae21..a5d4c7cefb09 100644 --- a/tests/src/python/test_qgsbox3d.py +++ b/tests/src/python/test_qgsbox3d.py @@ -11,12 +11,7 @@ import qgis # NOQA -from qgis.core import (QgsBox3d, - QgsPointXY, - QgsPoint, - QgsWkbTypes, - QgsRectangle) - +from qgis.core import QgsBox3d, QgsPoint, QgsRectangle from qgis.testing import unittest diff --git a/tests/src/python/test_qgscategorizedsymbolrenderer.py b/tests/src/python/test_qgscategorizedsymbolrenderer.py index 336249d54c8f..295fb10be9e6 100644 --- a/tests/src/python/test_qgscategorizedsymbolrenderer.py +++ b/tests/src/python/test_qgscategorizedsymbolrenderer.py @@ -11,37 +11,37 @@ __date__ = '2/12/2015' __copyright__ = 'Copyright 2015, The QGIS Project' -import qgis # NOQA - import os -from qgis.testing import unittest, start_app -from qgis.core import (QgsCategorizedSymbolRenderer, - QgsRendererCategory, - QgsMarkerSymbol, - QgsLineSymbol, - QgsFillSymbol, - QgsField, - QgsFields, - QgsFeature, - QgsSymbol, - QgsStyle, - QgsVectorLayer, - QgsEditorWidgetSetup, - QgsReadWriteContext, - QgsProject, - QgsSimpleMarkerSymbolLayer, - QgsSymbolLayer, - QgsProperty, - QgsMapSettings, - QgsRectangle, - QgsRenderContext, - QgsEmbeddedSymbolRenderer, - QgsGeometry - ) -from qgis.PyQt.QtCore import Qt, QVariant, QSize, QLocale, QTemporaryDir +import qgis # NOQA +from qgis.PyQt.QtCore import QLocale, QSize, Qt, QTemporaryDir, QVariant from qgis.PyQt.QtGui import QColor from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsCategorizedSymbolRenderer, + QgsEditorWidgetSetup, + QgsEmbeddedSymbolRenderer, + QgsFeature, + QgsField, + QgsFields, + QgsFillSymbol, + QgsGeometry, + QgsLineSymbol, + QgsMapSettings, + QgsMarkerSymbol, + QgsProject, + QgsProperty, + QgsReadWriteContext, + QgsRectangle, + QgsRenderContext, + QgsRendererCategory, + QgsSimpleMarkerSymbolLayer, + QgsStyle, + QgsSymbol, + QgsSymbolLayer, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgscheckablecombobox.py b/tests/src/python/test_qgscheckablecombobox.py index 5083ae952ac5..374ec00e60d7 100644 --- a/tests/src/python/test_qgscheckablecombobox.py +++ b/tests/src/python/test_qgscheckablecombobox.py @@ -13,8 +13,6 @@ from qgis.PyQt.QtCore import Qt from qgis.PyQt.QtTest import QSignalSpy - -from qgis.gui import QgsCheckableComboBox from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsclassificationmethod.py b/tests/src/python/test_qgsclassificationmethod.py index 637a7af5b3e4..edd6962fd8ef 100644 --- a/tests/src/python/test_qgsclassificationmethod.py +++ b/tests/src/python/test_qgsclassificationmethod.py @@ -9,21 +9,21 @@ __date__ = '3/09/2019' __copyright__ = 'Copyright 2019, The QGIS Project' -import qgis # NOQA import random +import qgis # NOQA from qgis.PyQt.QtCore import QLocale -from qgis.testing import unittest, start_app from qgis.core import ( - QgsClassificationMethod, - QgsClassificationLogarithmic, - QgsClassificationJenks, QgsClassificationFixedInterval, + QgsClassificationJenks, + QgsClassificationLogarithmic, + QgsClassificationMethod, QgsFeature, - QgsVectorLayer, + QgsGeometry, QgsPointXY, - QgsGeometry + QgsVectorLayer, ) +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgscodeeditor.py b/tests/src/python/test_qgscodeeditor.py index ea8b5dcca598..145fbdd6d851 100644 --- a/tests/src/python/test_qgscodeeditor.py +++ b/tests/src/python/test_qgscodeeditor.py @@ -9,16 +9,15 @@ __date__ = '03/10/2020' __copyright__ = 'Copyright 2020, The QGIS Project' -import qgis # NOQA - import sys -from qgis.core import QgsSettings, QgsApplication -from qgis.gui import QgsCodeEditor, QgsCodeEditorColorScheme - +import qgis # NOQA from qgis.PyQt.QtCore import QCoreApplication from qgis.PyQt.QtGui import QColor, QFont +from qgis.core import QgsApplication, QgsSettings +from qgis.gui import QgsCodeEditor, QgsCodeEditorColorScheme from qgis.testing import start_app, unittest + from utilities import getTestFont start_app() diff --git a/tests/src/python/test_qgscodeeditorcolorscheme.py b/tests/src/python/test_qgscodeeditorcolorscheme.py index b9b41702a6d4..ad21bd6f2360 100644 --- a/tests/src/python/test_qgscodeeditorcolorscheme.py +++ b/tests/src/python/test_qgscodeeditorcolorscheme.py @@ -10,16 +10,15 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -import sys - -from qgis.core import QgsSettings, QgsApplication -from qgis.gui import QgsCodeEditorColorScheme, QgsCodeEditorColorSchemeRegistry, QgsGui - from qgis.PyQt.QtCore import QCoreApplication -from qgis.PyQt.QtGui import QColor, QFont +from qgis.PyQt.QtGui import QColor +from qgis.core import QgsSettings +from qgis.gui import ( + QgsCodeEditorColorScheme, + QgsCodeEditorColorSchemeRegistry, + QgsGui, +) from qgis.testing import start_app, unittest -from utilities import getTestFont start_app() diff --git a/tests/src/python/test_qgscolorbutton.py b/tests/src/python/test_qgscolorbutton.py index 6b3b3fb7bc17..e15dba81b6da 100644 --- a/tests/src/python/test_qgscolorbutton.py +++ b/tests/src/python/test_qgscolorbutton.py @@ -10,12 +10,11 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - -from qgis.gui import QgsColorButton -from qgis.core import QgsApplication, QgsProjectColorScheme -from qgis.testing import start_app, unittest from qgis.PyQt.QtGui import QColor from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import QgsApplication, QgsProjectColorScheme +from qgis.gui import QgsColorButton +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgscolorramp.py b/tests/src/python/test_qgscolorramp.py index a1c0b584f749..4b1c058c2eaa 100644 --- a/tests/src/python/test_qgscolorramp.py +++ b/tests/src/python/test_qgscolorramp.py @@ -11,14 +11,16 @@ import qgis # NOQA from qgis.PyQt.QtGui import QColor, QGradient -from qgis.core import (Qgis, - QgsGradientColorRamp, - QgsGradientStop, - QgsLimitedRandomColorRamp, - QgsRandomColorRamp, - QgsColorBrewerColorRamp, - QgsCptCityColorRamp, - QgsPresetSchemeColorRamp) +from qgis.core import ( + Qgis, + QgsColorBrewerColorRamp, + QgsCptCityColorRamp, + QgsGradientColorRamp, + QgsGradientStop, + QgsLimitedRandomColorRamp, + QgsPresetSchemeColorRamp, + QgsRandomColorRamp, +) from qgis.testing import unittest diff --git a/tests/src/python/test_qgscolorramplegendnode.py b/tests/src/python/test_qgscolorramplegendnode.py index e73922c44716..5e0331b58f75 100644 --- a/tests/src/python/test_qgscolorramplegendnode.py +++ b/tests/src/python/test_qgscolorramplegendnode.py @@ -10,27 +10,28 @@ __copyright__ = 'Copyright 2015, The QGIS Project' import qgis # NOQA -from qgis.PyQt.QtCore import QSize, QDir, Qt, QSizeF +from qgis.PyQt.QtCore import QDir, QSize, QSizeF, Qt from qgis.PyQt.QtGui import QColor, QImage, QPainter -from qgis.PyQt.QtXml import QDomDocument, QDomElement - -from qgis.core import (QgsGradientColorRamp, - QgsRectangle, - QgsColorRampLegendNode, - QgsLayerTreeLayer, - QgsVectorLayer, - QgsMultiRenderChecker, - QgsFontUtils, - QgsLegendSettings, - QgsLegendStyle, - QgsLayerTreeModelLegendNode, - QgsRenderContext, - QgsMapSettings, - QgsColorRampLegendNodeSettings, - QgsBearingNumericFormat, - QgsReadWriteContext, - QgsBasicNumericFormat, - QgsTextFormat) +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsBasicNumericFormat, + QgsBearingNumericFormat, + QgsColorRampLegendNode, + QgsColorRampLegendNodeSettings, + QgsFontUtils, + QgsGradientColorRamp, + QgsLayerTreeLayer, + QgsLayerTreeModelLegendNode, + QgsLegendSettings, + QgsLegendStyle, + QgsMapSettings, + QgsMultiRenderChecker, + QgsReadWriteContext, + QgsRectangle, + QgsRenderContext, + QgsTextFormat, + QgsVectorLayer, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgscolorscheme.py b/tests/src/python/test_qgscolorscheme.py index c6e8b4fb92b0..ed608a66ab93 100644 --- a/tests/src/python/test_qgscolorscheme.py +++ b/tests/src/python/test_qgscolorscheme.py @@ -10,11 +10,16 @@ __copyright__ = 'Copyright 2014, The QGIS Project' import qgis # NOQA - -from qgis.testing import unittest, start_app -from qgis.core import QgsColorScheme, QgsUserColorScheme, QgsRecentColorScheme, QgsSettings from qgis.PyQt.QtCore import QCoreApplication from qgis.PyQt.QtGui import QColor +from qgis.core import ( + QgsColorScheme, + QgsRecentColorScheme, + QgsSettings, + QgsUserColorScheme, +) +from qgis.testing import start_app, unittest + # Make a dummy color scheme for testing diff --git a/tests/src/python/test_qgscolorschemeregistry.py b/tests/src/python/test_qgscolorschemeregistry.py index 61f6a3d2fcbb..fa461d0fb81a 100644 --- a/tests/src/python/test_qgscolorschemeregistry.py +++ b/tests/src/python/test_qgscolorschemeregistry.py @@ -11,8 +11,13 @@ import qgis # NOQA +from qgis.core import ( + QgsApplication, + QgsColorScheme, + QgsColorSchemeRegistry, + QgsRecentColorScheme, +) from qgis.testing import start_app, unittest -from qgis.core import QgsColorSchemeRegistry, QgsRecentColorScheme, QgsApplication, QgsColorScheme start_app() diff --git a/tests/src/python/test_qgscolorutils.py b/tests/src/python/test_qgscolorutils.py index a4516ba84c68..87a01d238915 100644 --- a/tests/src/python/test_qgscolorutils.py +++ b/tests/src/python/test_qgscolorutils.py @@ -9,22 +9,11 @@ __date__ = '06/07/2022' __copyright__ = 'Copyright 2022, The QGIS Project' -import shutil - import qgis # NOQA - -import tempfile -import os from qgis.PyQt.QtGui import QColor -from qgis.core import ( - QgsSymbolLayerUtils, - QgsColorUtils, - QgsReadWriteContext -) from qgis.PyQt.QtXml import QDomDocument - +from qgis.core import QgsColorUtils, QgsReadWriteContext, QgsSymbolLayerUtils from qgis.testing import unittest -from utilities import unitTestDataPath class TestQgsColorUtils(unittest.TestCase): diff --git a/tests/src/python/test_qgscombinedstylemodel.py b/tests/src/python/test_qgscombinedstylemodel.py index 4226e03ce1f2..a53558e42407 100644 --- a/tests/src/python/test_qgscombinedstylemodel.py +++ b/tests/src/python/test_qgscombinedstylemodel.py @@ -9,18 +9,9 @@ __date__ = '18/03/2022' __copyright__ = 'Copyright 2022, The QGIS Project' -import os - import qgis # NOQA - from qgis.PyQt.QtCore import QCoreApplication, QEvent, Qt - -from qgis.core import ( - QgsStyle, - QgsTextFormat, - QgsStyleModel -) - +from qgis.core import QgsStyle, QgsStyleModel, QgsTextFormat from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsconditionalformatwidgets.py b/tests/src/python/test_qgsconditionalformatwidgets.py index e92f2618900d..5bd73d3b90f4 100644 --- a/tests/src/python/test_qgsconditionalformatwidgets.py +++ b/tests/src/python/test_qgsconditionalformatwidgets.py @@ -9,14 +9,12 @@ __date__ = '2019-09-25' __copyright__ = 'Copyright 2019, The QGIS Project' -from qgis.core import (QgsConditionalStyle, - QgsMarkerSymbol) -from qgis.gui import QgsEditConditionalFormatRuleWidget -from qgis.testing import (start_app, - unittest, - ) -from utilities import unitTestDataPath, getTestFont from qgis.PyQt.QtGui import QColor +from qgis.core import QgsConditionalStyle, QgsMarkerSymbol +from qgis.gui import QgsEditConditionalFormatRuleWidget +from qgis.testing import start_app, unittest + +from utilities import getTestFont, unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsconditionalstyle.py b/tests/src/python/test_qgsconditionalstyle.py index 3d1f6dd4f890..049579c02ef7 100644 --- a/tests/src/python/test_qgsconditionalstyle.py +++ b/tests/src/python/test_qgsconditionalstyle.py @@ -9,21 +9,21 @@ __date__ = '2015-08-11' __copyright__ = 'Copyright 2015, The QGIS Project' -from qgis.core import (QgsConditionalStyle, - QgsFeature, - QgsFields, - QgsField, - QgsExpressionContextUtils, - QgsConditionalLayerStyles, - QgsMarkerSymbol - ) -from qgis.testing import (start_app, - unittest, - ) -from utilities import unitTestDataPath from qgis.PyQt.QtCore import QVariant -from qgis.PyQt.QtGui import QFont, QColor +from qgis.PyQt.QtGui import QColor, QFont from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import ( + QgsConditionalLayerStyles, + QgsConditionalStyle, + QgsExpressionContextUtils, + QgsFeature, + QgsField, + QgsFields, + QgsMarkerSymbol, +) +from qgis.testing import start_app, unittest + +from utilities import unitTestDataPath # start_app() diff --git a/tests/src/python/test_qgsconnectionregistry.py b/tests/src/python/test_qgsconnectionregistry.py index 7e8f07c02875..b0ad42e9e7d9 100644 --- a/tests/src/python/test_qgsconnectionregistry.py +++ b/tests/src/python/test_qgsconnectionregistry.py @@ -9,20 +9,21 @@ __date__ = '16/03/2020' __copyright__ = 'Copyright 2020, The QGIS Project' -import qgis # NOQA - -import shutil import os +import shutil import tempfile + +import qgis # NOQA +from qgis.PyQt.QtCore import QCoreApplication from qgis.core import ( QgsApplication, - QgsSettings, QgsProviderConnectionException, + QgsProviderRegistry, + QgsSettings, QgsVectorLayer, - QgsProviderRegistry ) -from qgis.PyQt.QtCore import QCoreApplication from qgis.testing import start_app, unittest + from utilities import unitTestDataPath # Convenience instances in case you may need them diff --git a/tests/src/python/test_qgscoordinateformatter.py b/tests/src/python/test_qgscoordinateformatter.py index 75b550e5bedd..5e5c5818a253 100644 --- a/tests/src/python/test_qgscoordinateformatter.py +++ b/tests/src/python/test_qgscoordinateformatter.py @@ -9,14 +9,9 @@ __date__ = '25/07/2014' __copyright__ = 'Copyright 2015, The QGIS Project' -import qgis -from qgis.testing import unittest -from qgis.core import ( - QgsCoordinateFormatter, - QgsPointXY, - Qgis -) from qgis.PyQt.QtCore import QLocale +from qgis.core import Qgis, QgsCoordinateFormatter, QgsPointXY +from qgis.testing import unittest class TestQgsCoordinateFormatter(unittest.TestCase): diff --git a/tests/src/python/test_qgscoordinateoperationwidget.py b/tests/src/python/test_qgscoordinateoperationwidget.py index 810bde180f95..9f57d92dcfc8 100644 --- a/tests/src/python/test_qgscoordinateoperationwidget.py +++ b/tests/src/python/test_qgscoordinateoperationwidget.py @@ -9,18 +9,18 @@ __date__ = '19/12/2019' __copyright__ = 'Copyright 2019, The QGIS Project' -import qgis # NOQA import os +import qgis # NOQA +from qgis.PyQt.QtTest import QSignalSpy from qgis.core import ( - QgsProjUtils, - QgsDatumTransform, QgsCoordinateReferenceSystem, - QgsCoordinateTransformContext) + QgsCoordinateTransformContext, + QgsDatumTransform, +) from qgis.gui import QgsCoordinateOperationWidget - -from qgis.PyQt.QtTest import QSignalSpy from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgscoordinatereferencesystem.py b/tests/src/python/test_qgscoordinatereferencesystem.py index cbbf1b2ddc38..80f6d9c9c602 100644 --- a/tests/src/python/test_qgscoordinatereferencesystem.py +++ b/tests/src/python/test_qgscoordinatereferencesystem.py @@ -13,8 +13,7 @@ import qgis # NOQA -from qgis.core import (QgsCoordinateReferenceSystem, - Qgis) +from qgis.core import Qgis, QgsCoordinateReferenceSystem from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgscoordinatereferencesystemutils.py b/tests/src/python/test_qgscoordinatereferencesystemutils.py index e2061cc10b4d..7163e2154f3f 100644 --- a/tests/src/python/test_qgscoordinatereferencesystemutils.py +++ b/tests/src/python/test_qgscoordinatereferencesystemutils.py @@ -11,9 +11,11 @@ import qgis # NOQA -from qgis.core import (QgsCoordinateReferenceSystem, - QgsCoordinateReferenceSystemUtils, - Qgis) +from qgis.core import ( + Qgis, + QgsCoordinateReferenceSystem, + QgsCoordinateReferenceSystemUtils, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgscoordinatetransform.py b/tests/src/python/test_qgscoordinatetransform.py index 6db1fa1e3002..868aa0e535d7 100644 --- a/tests/src/python/test_qgscoordinatetransform.py +++ b/tests/src/python/test_qgscoordinatetransform.py @@ -11,13 +11,13 @@ import qgis # NOQA -from qgis.core import (QgsRectangle, - QgsCoordinateReferenceSystem, - QgsCoordinateTransform, - QgsCoordinateTransformContext, - QgsDatumTransform, - QgsProject, - QgsProjUtils) +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsCoordinateTransform, + QgsCoordinateTransformContext, + QgsProject, + QgsRectangle, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgscoordinatetransformcontext.py b/tests/src/python/test_qgscoordinatetransformcontext.py index b2b47acee543..a337f07addb6 100644 --- a/tests/src/python/test_qgscoordinatetransformcontext.py +++ b/tests/src/python/test_qgscoordinatetransformcontext.py @@ -10,18 +10,17 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsCoordinateReferenceSystem, - QgsCoordinateTransformContext, - QgsDatumTransform, - QgsReadWriteContext, - QgsProject, - QgsSettings, - QgsProjUtils) -from qgis.testing import start_app, unittest -from qgis.PyQt.QtXml import QDomDocument -from qgis.PyQt.QtTest import QSignalSpy from qgis.PyQt.QtCore import QCoreApplication +from qgis.PyQt.QtTest import QSignalSpy +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsCoordinateTransformContext, + QgsProject, + QgsReadWriteContext, + QgsSettings, +) +from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgscore.py b/tests/src/python/test_qgscore.py index 3fecb439caa1..5d84f1b1a509 100644 --- a/tests/src/python/test_qgscore.py +++ b/tests/src/python/test_qgscore.py @@ -10,11 +10,9 @@ __copyright__ = 'Copyright 2019, The QGIS Project' import qgis # NOQA -import os -from qgis.testing import unittest, start_app -from qgis.core import qgsRound, qgsDoubleNear -from qgis.PyQt import sip +from qgis.core import qgsDoubleNear, qgsRound +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgscrsdefinitionwidget.py b/tests/src/python/test_qgscrsdefinitionwidget.py index fceaf528f2c6..e08b3e7209f0 100644 --- a/tests/src/python/test_qgscrsdefinitionwidget.py +++ b/tests/src/python/test_qgscrsdefinitionwidget.py @@ -12,7 +12,7 @@ import qgis # NOQA from qgis.PyQt.QtTest import QSignalSpy from qgis.core import QgsCoordinateReferenceSystem -from qgis.gui import (QgsCrsDefinitionWidget) +from qgis.gui import QgsCrsDefinitionWidget from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgscrsselectionwidget.py b/tests/src/python/test_qgscrsselectionwidget.py index bc20e40627ee..690425dd3fb3 100644 --- a/tests/src/python/test_qgscrsselectionwidget.py +++ b/tests/src/python/test_qgscrsselectionwidget.py @@ -12,8 +12,7 @@ import qgis # NOQA from qgis.PyQt.QtTest import QSignalSpy from qgis.core import QgsCoordinateReferenceSystem -from qgis.gui import (QgsCrsSelectionWidget) - +from qgis.gui import QgsCrsSelectionWidget from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsdatabaseschemacombobox.py b/tests/src/python/test_qgsdatabaseschemacombobox.py index 84645003d919..1e253f9105ae 100644 --- a/tests/src/python/test_qgsdatabaseschemacombobox.py +++ b/tests/src/python/test_qgsdatabaseschemacombobox.py @@ -9,22 +9,16 @@ __date__ = '8/03/2020' __copyright__ = 'Copyright 2020, The QGIS Project' -import qgis # NOQA - -import tempfile -import shutil import os -from qgis.core import ( - QgsVectorLayer, - QgsProviderRegistry -) -from qgis.gui import QgsDatabaseSchemaComboBox +import qgis # NOQA from qgis.PyQt.QtCore import QCoreApplication from qgis.PyQt.QtTest import QSignalSpy - +from qgis.core import QgsProviderRegistry +from qgis.gui import QgsDatabaseSchemaComboBox from qgis.testing import unittest -from utilities import unitTestDataPath, start_app + +from utilities import start_app, unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsdatabaseschemamodel.py b/tests/src/python/test_qgsdatabaseschemamodel.py index dc06ecb6fa32..eb7bece2513a 100644 --- a/tests/src/python/test_qgsdatabaseschemamodel.py +++ b/tests/src/python/test_qgsdatabaseschemamodel.py @@ -13,16 +13,10 @@ __revision__ = '$Format:%H$' import os -from qgis.core import ( - QgsDatabaseSchemaModel, - QgsProviderRegistry, -) -from qgis.PyQt.QtCore import ( - QCoreApplication, - QModelIndex, - Qt -) -from qgis.testing import unittest, start_app + +from qgis.PyQt.QtCore import QCoreApplication, QModelIndex, Qt +from qgis.core import QgsDatabaseSchemaModel, QgsProviderRegistry +from qgis.testing import start_app, unittest class TestPyQgsDatabaseSchemaModel(unittest.TestCase): diff --git a/tests/src/python/test_qgsdatabasetablecombobox.py b/tests/src/python/test_qgsdatabasetablecombobox.py index a8a6c456269b..56434727fcd3 100644 --- a/tests/src/python/test_qgsdatabasetablecombobox.py +++ b/tests/src/python/test_qgsdatabasetablecombobox.py @@ -9,23 +9,22 @@ __date__ = '8/03/2020' __copyright__ = 'Copyright 2020, The QGIS Project' -import qgis # NOQA - import os +import qgis # NOQA +from qgis.PyQt.QtCore import QCoreApplication, QVariant +from qgis.PyQt.QtTest import QSignalSpy from qgis.core import ( - QgsProviderRegistry, - QgsFields, + QgsCoordinateReferenceSystem, QgsField, + QgsFields, + QgsProviderRegistry, QgsWkbTypes, - QgsCoordinateReferenceSystem ) from qgis.gui import QgsDatabaseTableComboBox -from qgis.PyQt.QtCore import QCoreApplication, QVariant -from qgis.PyQt.QtTest import QSignalSpy - from qgis.testing import unittest -from utilities import unitTestDataPath, start_app + +from utilities import start_app, unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsdatabasetablemodel.py b/tests/src/python/test_qgsdatabasetablemodel.py index c02b9037cda1..4695866f11db 100644 --- a/tests/src/python/test_qgsdatabasetablemodel.py +++ b/tests/src/python/test_qgsdatabasetablemodel.py @@ -13,21 +13,17 @@ __revision__ = '$Format:%H$' import os + +from qgis.PyQt.QtCore import QCoreApplication, QModelIndex, Qt, QVariant from qgis.core import ( + QgsCoordinateReferenceSystem, QgsDatabaseTableModel, + QgsField, + QgsFields, QgsProviderRegistry, - QgsCoordinateReferenceSystem, QgsWkbTypes, - QgsFields, - QgsField -) -from qgis.PyQt.QtCore import ( - QCoreApplication, - QModelIndex, - Qt, - QVariant ) -from qgis.testing import unittest, start_app +from qgis.testing import start_app, unittest class TestPyQgsDatabaseTableModel(unittest.TestCase): diff --git a/tests/src/python/test_qgsdataitem.py b/tests/src/python/test_qgsdataitem.py index 304bd95b932c..81635c14edf2 100644 --- a/tests/src/python/test_qgsdataitem.py +++ b/tests/src/python/test_qgsdataitem.py @@ -11,10 +11,12 @@ import os + from qgis.core import QgsDataCollectionItem, QgsDirectoryItem -from utilities import unitTestDataPath from qgis.testing import start_app, unittest +from utilities import unitTestDataPath + app = start_app() diff --git a/tests/src/python/test_qgsdataitemguiproviderregistry.py b/tests/src/python/test_qgsdataitemguiproviderregistry.py index 486a88845a6e..9669db86ea49 100644 --- a/tests/src/python/test_qgsdataitemguiproviderregistry.py +++ b/tests/src/python/test_qgsdataitemguiproviderregistry.py @@ -11,11 +11,13 @@ import qgis # NOQA -from qgis.gui import (QgsGui, - QgsDataItemGuiContext, - QgsDataItemGuiProvider, - QgsDataItemGuiProviderRegistry, - QgsMessageBar) +from qgis.gui import ( + QgsDataItemGuiContext, + QgsDataItemGuiProvider, + QgsDataItemGuiProviderRegistry, + QgsGui, + QgsMessageBar, +) from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgsdataitemproviderregistry.py b/tests/src/python/test_qgsdataitemproviderregistry.py index 7f9966b74fb1..149aaca452db 100644 --- a/tests/src/python/test_qgsdataitemproviderregistry.py +++ b/tests/src/python/test_qgsdataitemproviderregistry.py @@ -11,10 +11,12 @@ import qgis # NOQA -from qgis.core import (QgsApplication, - QgsDataItemProvider, - QgsDataProvider, - QgsDataItemProviderRegistry) +from qgis.core import ( + QgsApplication, + QgsDataItemProvider, + QgsDataItemProviderRegistry, + QgsDataProvider, +) from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgsdatetimeedit.py b/tests/src/python/test_qgsdatetimeedit.py index 5988b0b77211..2ec590ac479b 100644 --- a/tests/src/python/test_qgsdatetimeedit.py +++ b/tests/src/python/test_qgsdatetimeedit.py @@ -10,9 +10,8 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.gui import QgsDateTimeEdit, QgsDateEdit, QgsTimeEdit -from qgis.PyQt.QtCore import Qt, QDateTime, QDate, QTime +from qgis.PyQt.QtCore import QDate, QDateTime, Qt, QTime +from qgis.gui import QgsDateEdit, QgsDateTimeEdit, QgsTimeEdit from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsdatetimestatisticalsummary.py b/tests/src/python/test_qgsdatetimestatisticalsummary.py index 3ce165ae2d8b..656eb6201506 100644 --- a/tests/src/python/test_qgsdatetimestatisticalsummary.py +++ b/tests/src/python/test_qgsdatetimestatisticalsummary.py @@ -10,12 +10,8 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsDateTimeStatisticalSummary, - QgsInterval, - NULL - ) -from qgis.PyQt.QtCore import QDateTime, QDate, QTime +from qgis.PyQt.QtCore import QDate, QDateTime, QTime +from qgis.core import NULL, QgsDateTimeStatisticalSummary, QgsInterval from qgis.testing import unittest diff --git a/tests/src/python/test_qgsdatumtransforms.py b/tests/src/python/test_qgsdatumtransforms.py index 4062a07e72ec..bf47baf95b31 100644 --- a/tests/src/python/test_qgsdatumtransforms.py +++ b/tests/src/python/test_qgsdatumtransforms.py @@ -10,13 +10,12 @@ __copyright__ = 'Copyright 2019, The QGIS Project' from qgis.core import ( - QgsProjUtils, QgsCoordinateReferenceSystem, - QgsDatumTransform + QgsDatumTransform, + QgsProjUtils, ) -from qgis.testing import (start_app, - unittest, - ) +from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsdefaultvalue.py b/tests/src/python/test_qgsdefaultvalue.py index 376853eec2c3..cec8315cb039 100644 --- a/tests/src/python/test_qgsdefaultvalue.py +++ b/tests/src/python/test_qgsdefaultvalue.py @@ -12,8 +12,7 @@ import qgis # NOQA - -from qgis.core import (QgsDefaultValue) +from qgis.core import QgsDefaultValue from qgis.testing import unittest diff --git a/tests/src/python/test_qgsdelimitedtextprovider.py b/tests/src/python/test_qgsdelimitedtextprovider.py index 7eb823e95322..0566c5fe0c1d 100644 --- a/tests/src/python/test_qgsdelimitedtextprovider.py +++ b/tests/src/python/test_qgsdelimitedtextprovider.py @@ -20,37 +20,42 @@ # # To recreate all tests, set rebuildTests to true -import qgis # NOQA - +import inspect import os import re import tempfile -import inspect import time -import test_qgsdelimitedtextprovider_wanted as want # NOQA - from collections.abc import Callable -rebuildTests = 'REBUILD_DELIMITED_TEXT_TESTS' in os.environ +import qgis # NOQA + +import test_qgsdelimitedtextprovider_wanted as want # NOQA -from qgis.PyQt.QtCore import QCoreApplication, QVariant, QUrl, QObject, QTemporaryDir, QDate +rebuildTests = 'REBUILD_DELIMITED_TEXT_TESTS' in os.environ +from providertestbase import ProviderTestCase from qgis.core import ( + NULL, + QgsApplication, + QgsFeature, + QgsFeatureRequest, + QgsFeatureSource, QgsGeometry, QgsProviderRegistry, - QgsVectorLayer, - QgsFeatureRequest, QgsRectangle, - QgsApplication, - QgsFeature, + QgsVectorLayer, QgsWkbTypes, - QgsFeatureSource, - NULL) - +) +from qgis.PyQt.QtCore import ( + QCoreApplication, + QDate, + QObject, + QTemporaryDir, + QUrl, + QVariant, +) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath, compareWkt, compareUrl - -from providertestbase import ProviderTestCase +from utilities import compareUrl, compareWkt, unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsdistancearea.py b/tests/src/python/test_qgsdistancearea.py index 8c8a5d36285c..d88280a7158a 100644 --- a/tests/src/python/test_qgsdistancearea.py +++ b/tests/src/python/test_qgsdistancearea.py @@ -9,19 +9,20 @@ __date__ = '19/01/2014' __copyright__ = 'Copyright 2014, The QGIS Project' -import qgis # NOQA import math +from pprint import pprint -from qgis.core import (QgsGeometry, - QgsPointXY, - QgsDistanceArea, - QgsCoordinateReferenceSystem, - QgsUnitTypes, - QgsProject) - -from qgis.testing import start_app, unittest +import qgis # NOQA from qgis.PyQt.QtCore import QLocale -from pprint import pprint +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsDistanceArea, + QgsGeometry, + QgsPointXY, + QgsProject, + QgsUnitTypes, +) +from qgis.testing import start_app, unittest # Convenience instances in case you may need them # not used in this test diff --git a/tests/src/python/test_qgseditformconfig.py b/tests/src/python/test_qgseditformconfig.py index 69fc6b70486e..5bb4e1f2b28a 100644 --- a/tests/src/python/test_qgseditformconfig.py +++ b/tests/src/python/test_qgseditformconfig.py @@ -9,21 +9,30 @@ __date__ = '11/04/2017' __copyright__ = 'Copyright 2018, The QGIS Project' -import qgis # NOQA +import http.server import os +import socketserver +import threading -from qgis.core import (QgsApplication, QgsVectorLayer, QgsReadWriteContext, QgsEditFormConfig, - QgsFetchedContent, QgsAttributeEditorContainer, QgsFeature, QgsSettings, - Qgis, QgsNetworkContentFetcherRegistry, QgsAttributeEditorElement) +import qgis # NOQA +from qgis.PyQt.QtGui import QColor +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsApplication, + QgsAttributeEditorContainer, + QgsAttributeEditorElement, + QgsEditFormConfig, + QgsFeature, + QgsFetchedContent, + QgsNetworkContentFetcherRegistry, + QgsReadWriteContext, + QgsSettings, + QgsVectorLayer, +) from qgis.gui import QgsGui - from qgis.testing import start_app, unittest -from qgis.PyQt.QtXml import QDomDocument -from qgis.PyQt.QtGui import QColor + from utilities import unitTestDataPath -import socketserver -import threading -import http.server app = start_app() diff --git a/tests/src/python/test_qgseditwidgets.py b/tests/src/python/test_qgseditwidgets.py index 9f7ed35a221f..aa663cb31335 100644 --- a/tests/src/python/test_qgseditwidgets.py +++ b/tests/src/python/test_qgseditwidgets.py @@ -10,13 +10,19 @@ __copyright__ = 'Copyright 2015, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsProject, QgsFeature, QgsGeometry, QgsPointXY, QgsVectorLayer, NULL, QgsField) +from qgis.PyQt.QtCore import QVariant +from qgis.PyQt.QtWidgets import QTextEdit +from qgis.core import ( + NULL, + QgsFeature, + QgsField, + QgsGeometry, + QgsPointXY, + QgsProject, + QgsVectorLayer, +) from qgis.gui import QgsGui - from qgis.testing import start_app, unittest -from qgis.PyQt.QtCore import Qt, QVariant -from qgis.PyQt.QtWidgets import QTextEdit, QTableWidgetItem start_app() diff --git a/tests/src/python/test_qgselevationprofilecanvas.py b/tests/src/python/test_qgselevationprofilecanvas.py index c5941311a2f8..ede3f2d0142e 100644 --- a/tests/src/python/test_qgselevationprofilecanvas.py +++ b/tests/src/python/test_qgselevationprofilecanvas.py @@ -10,33 +10,16 @@ __copyright__ = 'Copyright 2022, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtCore import ( - QDir, - QEvent, - Qt, - QPoint, - QPointF -) -from qgis.PyQt.QtGui import ( - QKeyEvent, - QMouseEvent, - QWheelEvent -) - +from qgis.PyQt.QtCore import QDir, QEvent, QPoint, QPointF, Qt +from qgis.PyQt.QtGui import QKeyEvent, QMouseEvent, QWheelEvent from qgis.core import ( QgsCoordinateReferenceSystem, QgsLineString, QgsPoint, QgsPointXY, - QgsProject -) -from qgis.gui import ( - QgsElevationProfileCanvas, - QgsPlotTool, - QgsPlotMouseEvent + QgsProject, ) - +from qgis.gui import QgsElevationProfileCanvas, QgsPlotMouseEvent, QgsPlotTool from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgsellipsoidutils.py b/tests/src/python/test_qgsellipsoidutils.py index 42a84d7cae8c..a61092c98fe7 100644 --- a/tests/src/python/test_qgsellipsoidutils.py +++ b/tests/src/python/test_qgsellipsoidutils.py @@ -10,8 +10,8 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA -from qgis.core import (QgsEllipsoidUtils, - QgsProjUtils) + +from qgis.core import QgsEllipsoidUtils, QgsProjUtils from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgsembeddedsymbolrenderer.py b/tests/src/python/test_qgsembeddedsymbolrenderer.py index 73627586d88e..40b2a898473b 100644 --- a/tests/src/python/test_qgsembeddedsymbolrenderer.py +++ b/tests/src/python/test_qgsembeddedsymbolrenderer.py @@ -23,19 +23,20 @@ __copyright__ = '(C) 2015, Matthias Kuhn' import qgis # NOQA -from qgis.PyQt.QtCore import QSize, QDir -from qgis.core import (QgsVectorLayer, - QgsRectangle, - QgsMultiRenderChecker, - QgsEmbeddedSymbolRenderer, - QgsFillSymbol, - QgsMarkerSymbol, - QgsLineSymbol, - QgsMapSettings, - QgsFeature, - QgsGeometry - ) -from qgis.testing import unittest, start_app +from qgis.PyQt.QtCore import QDir, QSize +from qgis.core import ( + QgsEmbeddedSymbolRenderer, + QgsFeature, + QgsFillSymbol, + QgsGeometry, + QgsLineSymbol, + QgsMapSettings, + QgsMarkerSymbol, + QgsMultiRenderChecker, + QgsRectangle, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsencodingselectiondialog.py b/tests/src/python/test_qgsencodingselectiondialog.py index 3d3b66b4291b..a7f277849d1f 100644 --- a/tests/src/python/test_qgsencodingselectiondialog.py +++ b/tests/src/python/test_qgsencodingselectiondialog.py @@ -11,8 +11,6 @@ import qgis # NOQA -from qgis.gui import QgsEncodingSelectionDialog - from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsexiftools.py b/tests/src/python/test_qgsexiftools.py index d085f9100275..b033ec056bb0 100644 --- a/tests/src/python/test_qgsexiftools.py +++ b/tests/src/python/test_qgsexiftools.py @@ -9,12 +9,14 @@ __date__ = '09/11/2018' __copyright__ = 'Copyright 2018, The QGIS Project' -import qgis # NOQA switch sip api import os import shutil -from qgis.PyQt.QtCore import QTemporaryFile, QDateTime -from qgis.core import QgsPointXY, QgsExifTools + +import qgis # NOQA switch sip api +from qgis.PyQt.QtCore import QDateTime, QTemporaryFile +from qgis.core import QgsExifTools, QgsPointXY from qgis.testing import start_app, unittest + from utilities import unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsexpression.py b/tests/src/python/test_qgsexpression.py index c7c4f0c1aea4..253560bb34e1 100644 --- a/tests/src/python/test_qgsexpression.py +++ b/tests/src/python/test_qgsexpression.py @@ -10,11 +10,16 @@ __copyright__ = 'Copyright 2012, The QGIS Project' import qgis # NOQA - from qgis.PyQt.QtCore import QVariant +from qgis.core import ( + NULL, + QgsExpression, + QgsExpressionContext, + QgsFeatureRequest, + QgsFields, +) from qgis.testing import unittest from qgis.utils import qgsfunction -from qgis.core import QgsExpression, QgsFeatureRequest, QgsFields, QgsExpressionContext, NULL class TestQgsExpressionCustomFunctions(unittest.TestCase): diff --git a/tests/src/python/test_qgsexpressionbuilderwidget.py b/tests/src/python/test_qgsexpressionbuilderwidget.py index af84f75632d3..af3c4bb76e4e 100644 --- a/tests/src/python/test_qgsexpressionbuilderwidget.py +++ b/tests/src/python/test_qgsexpressionbuilderwidget.py @@ -10,18 +10,19 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - from qgis.PyQt.QtCore import Qt from qgis.PyQt.QtWidgets import QListView -from qgis.testing import start_app, unittest +from qgis.core import ( + QgsExpressionContext, + QgsExpressionContextScope, + QgsFeature, + QgsProject, + QgsRelation, + QgsVectorLayer, +) from qgis.gui import QgsExpressionBuilderWidget -from qgis.core import (QgsExpressionContext, - QgsExpressionContextScope, - QgsProject, - QgsVectorLayer, - QgsRelation, - QgsFeature, - QgsGeometry) +from qgis.testing import start_app, unittest + start_app() diff --git a/tests/src/python/test_qgsexpressionlineedit.py b/tests/src/python/test_qgsexpressionlineedit.py index d5cb466c9efb..5328e0f6ef1c 100644 --- a/tests/src/python/test_qgsexpressionlineedit.py +++ b/tests/src/python/test_qgsexpressionlineedit.py @@ -17,8 +17,8 @@ except: use_signal_spy = False -from qgis.testing import start_app, unittest from qgis.gui import QgsExpressionLineEdit +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsextentgroupbox.py b/tests/src/python/test_qgsextentgroupbox.py index d44d966ff6d9..3677fb4d214f 100644 --- a/tests/src/python/test_qgsextentgroupbox.py +++ b/tests/src/python/test_qgsextentgroupbox.py @@ -9,14 +9,21 @@ __date__ = '31/05/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA import os -from qgis.core import QgsRectangle, QgsCoordinateReferenceSystem, QgsVectorLayer, QgsProject, QgsFeature, QgsGeometry -from qgis.gui import QgsExtentGroupBox - +import qgis # NOQA from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsFeature, + QgsGeometry, + QgsProject, + QgsRectangle, + QgsVectorLayer, +) +from qgis.gui import QgsExtentGroupBox from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsextentwidget.py b/tests/src/python/test_qgsextentwidget.py index c25713c06ce3..6fcc46acac9c 100644 --- a/tests/src/python/test_qgsextentwidget.py +++ b/tests/src/python/test_qgsextentwidget.py @@ -9,14 +9,21 @@ __date__ = '25/03/2020' __copyright__ = 'Copyright 2020, The QGIS Project' -import qgis # NOQA import os -from qgis.core import QgsRectangle, QgsCoordinateReferenceSystem, QgsVectorLayer, QgsProject, QgsFeature, QgsGeometry -from qgis.gui import QgsExtentWidget - +import qgis # NOQA from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsFeature, + QgsGeometry, + QgsProject, + QgsRectangle, + QgsVectorLayer, +) +from qgis.gui import QgsExtentWidget from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsexternalstorage_awss3.py b/tests/src/python/test_qgsexternalstorage_awss3.py index c99628e5ed57..8dfaf446612f 100644 --- a/tests/src/python/test_qgsexternalstorage_awss3.py +++ b/tests/src/python/test_qgsexternalstorage_awss3.py @@ -12,26 +12,14 @@ __date__ = "20/12/2022" __copyright__ = "Copyright 2022, The QGIS Project" -from shutil import rmtree import os -import tempfile -import time - -from utilities import unitTestDataPath, waitServer -from test_qgsexternalstorage_base import TestPyQgsExternalStorageBase - -from qgis.PyQt.QtCore import QCoreApplication, QEventLoop, QUrl from qgis.core import ( - QgsApplication, QgsAuthMethodConfig, - QgsExternalStorageFetchedContent, ) +from qgis.testing import unittest -from qgis.testing import ( - start_app, - unittest, -) +from test_qgsexternalstorage_base import TestPyQgsExternalStorageBase class TestPyQgsExternalStorageAwsS3(TestPyQgsExternalStorageBase, unittest.TestCase): diff --git a/tests/src/python/test_qgsexternalstorage_base.py b/tests/src/python/test_qgsexternalstorage_base.py index 58706171d884..81229e47a196 100644 --- a/tests/src/python/test_qgsexternalstorage_base.py +++ b/tests/src/python/test_qgsexternalstorage_base.py @@ -12,27 +12,17 @@ __date__ = "31/03/2021" __copyright__ = "Copyright 2021, The QGIS Project" -from shutil import rmtree import os import tempfile -import time -from utilities import unitTestDataPath, waitServer - -from qgis.PyQt.QtCore import QCoreApplication, QEventLoop, QUrl, QTimer +from qgis.PyQt.QtCore import QCoreApplication, QEventLoop, QTimer from qgis.PyQt.QtTest import QSignalSpy - from qgis.core import ( Qgis, QgsApplication, QgsAuthMethodConfig, - QgsExternalStorageFetchedContent, -) - -from qgis.testing import ( - start_app, - unittest, ) +from qgis.testing import start_app class TestPyQgsExternalStorageBase: diff --git a/tests/src/python/test_qgsexternalstorage_simplecopy.py b/tests/src/python/test_qgsexternalstorage_simplecopy.py index 7aeac3a12f11..3e24b3f8cff0 100644 --- a/tests/src/python/test_qgsexternalstorage_simplecopy.py +++ b/tests/src/python/test_qgsexternalstorage_simplecopy.py @@ -10,26 +10,11 @@ __date__ = '31/03/2021' __copyright__ = 'Copyright 2021, The QGIS Project' -from shutil import rmtree -import os -import tempfile -import time +from qgis.PyQt.QtCore import QTemporaryDir +from qgis.testing import unittest -from utilities import unitTestDataPath, waitServer from test_qgsexternalstorage_base import TestPyQgsExternalStorageBase -from qgis.PyQt.QtCore import QCoreApplication, QEventLoop, QUrl, QTemporaryDir - -from qgis.core import ( - QgsApplication, - QgsAuthMethodConfig, - QgsExternalStorageFetchedContent) - -from qgis.testing import ( - start_app, - unittest, -) - class TestPyQgsExternalStorageSimpleCopy(TestPyQgsExternalStorageBase, unittest.TestCase): diff --git a/tests/src/python/test_qgsexternalstorage_webdav.py b/tests/src/python/test_qgsexternalstorage_webdav.py index d4c87868fc40..206179b39aaa 100644 --- a/tests/src/python/test_qgsexternalstorage_webdav.py +++ b/tests/src/python/test_qgsexternalstorage_webdav.py @@ -12,25 +12,11 @@ __date__ = '31/03/2021' __copyright__ = 'Copyright 2021, The QGIS Project' -from shutil import rmtree import os -import tempfile -import time -from utilities import unitTestDataPath, waitServer -from test_qgsexternalstorage_base import TestPyQgsExternalStorageBase - -from qgis.PyQt.QtCore import QCoreApplication, QEventLoop, QUrl +from qgis.testing import unittest -from qgis.core import ( - QgsApplication, - QgsAuthMethodConfig, - QgsExternalStorageFetchedContent) - -from qgis.testing import ( - start_app, - unittest, -) +from test_qgsexternalstorage_base import TestPyQgsExternalStorageBase class TestPyQgsExternalStorageWebDav(TestPyQgsExternalStorageBase, unittest.TestCase): diff --git a/tests/src/python/test_qgsfeature.py b/tests/src/python/test_qgsfeature.py index c284ba09f8cf..8980e965ef1c 100644 --- a/tests/src/python/test_qgsfeature.py +++ b/tests/src/python/test_qgsfeature.py @@ -9,19 +9,22 @@ __date__ = '06/10/2012' __copyright__ = 'Copyright 2012, The QGIS Project' -import qgis # NOQA - import os -from qgis.core import (QgsFeature, - QgsPoint, - QgsGeometry, - QgsPointXY, - QgsVectorLayer, - NULL, - QgsFields, - QgsField, - QgsUnsetAttributeValue) + +import qgis # NOQA +from qgis.core import ( + NULL, + QgsFeature, + QgsField, + QgsFields, + QgsGeometry, + QgsPoint, + QgsPointXY, + QgsUnsetAttributeValue, + QgsVectorLayer, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsfeatureiterator.py b/tests/src/python/test_qgsfeatureiterator.py index cea317cb9f89..fd7daec258f4 100644 --- a/tests/src/python/test_qgsfeatureiterator.py +++ b/tests/src/python/test_qgsfeatureiterator.py @@ -9,23 +9,23 @@ __date__ = '18/09/2013' __copyright__ = 'Copyright 2013, The QGIS Project' -import qgis # NOQA - import os -from qgis.core import (QgsAuxiliaryStorage, - QgsAuxiliaryLayer, - QgsVectorLayer, - QgsFeatureRequest, - QgsFeature, - QgsField, - NULL, - QgsProject, - QgsPropertyDefinition, - QgsVectorLayerJoinInfo, - QgsGeometry) -from qgis.testing import start_app, unittest +import qgis # NOQA from qgis.PyQt.QtCore import QVariant +from qgis.core import ( + NULL, + QgsAuxiliaryStorage, + QgsFeature, + QgsFeatureRequest, + QgsField, + QgsGeometry, + QgsProject, + QgsPropertyDefinition, + QgsVectorLayer, + QgsVectorLayerJoinInfo, +) +from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsfeaturepicker.py b/tests/src/python/test_qgsfeaturepicker.py index ba11237ad13b..3732e7eb49ab 100644 --- a/tests/src/python/test_qgsfeaturepicker.py +++ b/tests/src/python/test_qgsfeaturepicker.py @@ -10,26 +10,18 @@ __copyright__ = 'Copyright 2015, The QGIS Project' import qgis # NOQA - -import os - +from qgis.PyQt.QtTest import QSignalSpy, QTest +from qgis.PyQt.QtWidgets import QComboBox from qgis.core import ( QgsApplication, QgsFeature, - QgsVectorLayer, + QgsGeometry, QgsPointXY, - QgsGeometry -) -from qgis.gui import ( - QgsFeaturePickerWidget + QgsVectorLayer, ) - +from qgis.gui import QgsFeaturePickerWidget from qgis.testing import start_app, unittest -from qgis.PyQt.QtWidgets import QComboBox -from qgis.PyQt.QtTest import QSignalSpy, QTest - - start_app() diff --git a/tests/src/python/test_qgsfeaturerequest.py b/tests/src/python/test_qgsfeaturerequest.py index 7ca47de5a5b4..551d22c6a81d 100644 --- a/tests/src/python/test_qgsfeaturerequest.py +++ b/tests/src/python/test_qgsfeaturerequest.py @@ -10,22 +10,22 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsFeatureRequest, - QgsRectangle, - QgsExpressionContext, - QgsExpressionContextScope, - QgsFields, - QgsField, - QgsSimplifyMethod, - QgsCoordinateReferenceSystem, - QgsCoordinateTransformContext, - QgsGeometry, - Qgis) from qgis.PyQt.QtCore import QVariant +from qgis.core import ( + Qgis, + QgsCoordinateReferenceSystem, + QgsCoordinateTransformContext, + QgsExpressionContext, + QgsExpressionContextScope, + QgsFeatureRequest, + QgsField, + QgsFields, + QgsGeometry, + QgsRectangle, + QgsSimplifyMethod, +) from qgis.testing import start_app, unittest - from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsfeaturesink.py b/tests/src/python/test_qgsfeaturesink.py index 966ad9f72207..e34e72871e6c 100644 --- a/tests/src/python/test_qgsfeaturesink.py +++ b/tests/src/python/test_qgsfeaturesink.py @@ -8,30 +8,29 @@ __author__ = '(C) 2017 by Nyall Dawson' __date__ = '26/04/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA -import os - -from qgis.core import (QgsFeatureStore, - QgsVectorLayer, - QgsFeature, - QgsGeometry, - QgsPointXY, - QgsField, - QgsFields, - QgsCoordinateReferenceSystem, - QgsProxyFeatureSink, - QgsRemappingProxyFeatureSink, - QgsRemappingSinkDefinition, - QgsWkbTypes, - QgsCoordinateTransform, - QgsProject, - QgsProperty, - QgsExpressionContext, - QgsExpressionContextScope - ) +import qgis # NOQA from qgis.PyQt.QtCore import QVariant +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsExpressionContext, + QgsExpressionContextScope, + QgsFeature, + QgsFeatureStore, + QgsField, + QgsFields, + QgsGeometry, + QgsPointXY, + QgsProject, + QgsProperty, + QgsProxyFeatureSink, + QgsRemappingProxyFeatureSink, + QgsRemappingSinkDefinition, + QgsVectorLayer, + QgsWkbTypes, +) from qgis.testing import start_app, unittest + start_app() diff --git a/tests/src/python/test_qgsfeaturesource.py b/tests/src/python/test_qgsfeaturesource.py index 20802207fd24..d49c90f1bf4e 100644 --- a/tests/src/python/test_qgsfeaturesource.py +++ b/tests/src/python/test_qgsfeaturesource.py @@ -8,20 +8,21 @@ __author__ = '(C) 2017 by Nyall Dawson' __date__ = '26/04/2017' __copyright__ = 'Copyright 2017, The QGIS Project' + import qgis # NOQA -import os - -from qgis.core import (QgsVectorLayer, - QgsFeature, - QgsGeometry, - QgsPointXY, - QgsProject, - QgsFeatureRequest, - QgsWkbTypes, - QgsCoordinateReferenceSystem) -from qgis.PyQt.QtCore import QVariant +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsFeature, + QgsFeatureRequest, + QgsGeometry, + QgsPointXY, + QgsProject, + QgsVectorLayer, + QgsWkbTypes, +) from qgis.testing import start_app, unittest + start_app() diff --git a/tests/src/python/test_qgsfeedback.py b/tests/src/python/test_qgsfeedback.py index 55a5fbde237d..a1103985d255 100644 --- a/tests/src/python/test_qgsfeedback.py +++ b/tests/src/python/test_qgsfeedback.py @@ -10,9 +10,8 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsFeedback) from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import QgsFeedback from qgis.testing import unittest diff --git a/tests/src/python/test_qgsfieldcombobox.py b/tests/src/python/test_qgsfieldcombobox.py index 24de5bc8154d..a6be1c22cf9a 100644 --- a/tests/src/python/test_qgsfieldcombobox.py +++ b/tests/src/python/test_qgsfieldcombobox.py @@ -10,13 +10,18 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.core import QgsFields, QgsVectorLayer, QgsFieldProxyModel, QgsField, QgsFieldModel -from qgis.gui import QgsFieldComboBox -from qgis.PyQt.QtCore import QVariant, Qt +from qgis.PyQt.QtCore import QVariant from qgis.PyQt.QtTest import QSignalSpy - +from qgis.core import ( + QgsField, + QgsFieldModel, + QgsFieldProxyModel, + QgsFields, + QgsVectorLayer, +) +from qgis.gui import QgsFieldComboBox from qgis.testing import start_app, unittest + start_app() diff --git a/tests/src/python/test_qgsfielddomain.py b/tests/src/python/test_qgsfielddomain.py index e41f39c3a267..2cf8c9875331 100644 --- a/tests/src/python/test_qgsfielddomain.py +++ b/tests/src/python/test_qgsfielddomain.py @@ -9,14 +9,15 @@ __date__ = '2022-01-25' __copyright__ = 'Copyright 2022, The QGIS Project' -from qgis.core import (Qgis, - QgsCodedValue, - QgsCodedFieldDomain, - QgsRangeFieldDomain, - QgsGlobFieldDomain) from qgis.PyQt.QtCore import QVariant +from qgis.core import ( + Qgis, + QgsCodedFieldDomain, + QgsCodedValue, + QgsGlobFieldDomain, + QgsRangeFieldDomain, +) from qgis.testing import unittest -from utilities import unitTestDataPath class TestPyQgsFieldDomain(unittest.TestCase): diff --git a/tests/src/python/test_qgsfielddomainwidget.py b/tests/src/python/test_qgsfielddomainwidget.py index e148e9513bd0..d668b816a3b6 100644 --- a/tests/src/python/test_qgsfielddomainwidget.py +++ b/tests/src/python/test_qgsfielddomainwidget.py @@ -9,13 +9,15 @@ __date__ = '2022-01-25' __copyright__ = 'Copyright 2022, The QGIS Project' -from qgis.core import (Qgis, - QgsCodedValue, - QgsCodedFieldDomain, - QgsRangeFieldDomain, - QgsGlobFieldDomain) -from qgis.gui import QgsFieldDomainWidget from qgis.PyQt.QtCore import QVariant +from qgis.core import ( + Qgis, + QgsCodedFieldDomain, + QgsCodedValue, + QgsGlobFieldDomain, + QgsRangeFieldDomain, +) +from qgis.gui import QgsFieldDomainWidget from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsfieldformatters.py b/tests/src/python/test_qgsfieldformatters.py index ec4a3fdb021e..04e3bb54cdb4 100644 --- a/tests/src/python/test_qgsfieldformatters.py +++ b/tests/src/python/test_qgsfieldformatters.py @@ -9,36 +9,36 @@ __date__ = '05/12/2016' __copyright__ = 'Copyright 2016, The QGIS Project' -import tempfile import os +import tempfile import qgis # NOQA from qgis.PyQt.QtCore import ( QCoreApplication, - QLocale, - QVariant, QDate, - QTime, QDateTime, - Qt + QLocale, + Qt, + QTime, + QVariant, ) from qgis.core import ( QgsApplication, + QgsCheckBoxFieldFormatter, + QgsDateTimeFieldFormatter, + QgsFallbackFieldFormatter, QgsFeature, + QgsGeometry, + QgsPointXY, QgsProject, + QgsRangeFieldFormatter, QgsRelation, - QgsVectorLayer, - QgsValueMapFieldFormatter, - QgsValueRelationFieldFormatter, QgsRelationReferenceFieldFormatter, - QgsRangeFieldFormatter, - QgsCheckBoxFieldFormatter, - QgsFallbackFieldFormatter, - QgsDateTimeFieldFormatter, QgsSettings, - QgsGeometry, - QgsPointXY, - QgsVectorFileWriter + QgsValueMapFieldFormatter, + QgsValueRelationFieldFormatter, + QgsVectorFileWriter, + QgsVectorLayer, ) from qgis.testing import start_app, unittest from qgis.utils import spatialite_connect diff --git a/tests/src/python/test_qgsfieldmappingwidget.py b/tests/src/python/test_qgsfieldmappingwidget.py index 653b3d76e1b7..0954a37922e1 100644 --- a/tests/src/python/test_qgsfieldmappingwidget.py +++ b/tests/src/python/test_qgsfieldmappingwidget.py @@ -12,26 +12,16 @@ # This will get replaced with a git SHA1 when you do a git archive __revision__ = '$Format:%H$' -from qgis.core import ( - QgsFields, - QgsField, - QgsFieldConstraints, - QgsProperty -) -from qgis.gui import ( - QgsFieldMappingWidget, - QgsFieldMappingModel, -) from qgis.PyQt.Qt import Qt from qgis.PyQt.QtCore import ( QCoreApplication, - QVariant, - QModelIndex, QItemSelectionModel, + QModelIndex, + QVariant, ) -from qgis.PyQt.QtGui import ( - QColor -) +from qgis.PyQt.QtGui import QColor +from qgis.core import QgsField, QgsFieldConstraints, QgsFields, QgsProperty +from qgis.gui import QgsFieldMappingModel, QgsFieldMappingWidget from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsfieldmodel.py b/tests/src/python/test_qgsfieldmodel.py index 0c26a3f854d7..be0dcdb6975b 100644 --- a/tests/src/python/test_qgsfieldmodel.py +++ b/tests/src/python/test_qgsfieldmodel.py @@ -10,18 +10,18 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsField, - QgsFields, - QgsVectorLayer, - QgsFieldModel, - QgsFieldProxyModel, - QgsEditorWidgetSetup, - QgsProject, - QgsVectorLayerJoinInfo, - QgsFieldConstraints) -from qgis.PyQt.QtCore import QVariant, Qt, QModelIndex - +from qgis.PyQt.QtCore import QModelIndex, Qt, QVariant +from qgis.core import ( + QgsEditorWidgetSetup, + QgsField, + QgsFieldConstraints, + QgsFieldModel, + QgsFieldProxyModel, + QgsFields, + QgsProject, + QgsVectorLayer, + QgsVectorLayerJoinInfo, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsfields.py b/tests/src/python/test_qgsfields.py index a8bf02bccb71..7fa0725ad178 100644 --- a/tests/src/python/test_qgsfields.py +++ b/tests/src/python/test_qgsfields.py @@ -10,10 +10,9 @@ __copyright__ = 'Copyright 2015, The QGIS Project' import qgis # NOQA - -from qgis.core import QgsVectorLayer, NULL +from qgis.PyQt.QtCore import QDate, QVariant +from qgis.core import NULL, QgsVectorLayer from qgis.testing import start_app, unittest -from qgis.PyQt.QtCore import QVariant, QDate, QDateTime, QTime start_app() diff --git a/tests/src/python/test_qgsfieldvalidator.py b/tests/src/python/test_qgsfieldvalidator.py index 35604150d444..88a423976e61 100644 --- a/tests/src/python/test_qgsfieldvalidator.py +++ b/tests/src/python/test_qgsfieldvalidator.py @@ -9,16 +9,17 @@ __date__ = '31/01/2018' __copyright__ = 'Copyright 2018, The QGIS Project' -import qgis # NOQA -import tempfile import os import shutil +import tempfile -from qgis.PyQt.QtCore import QVariant, QLocale +import qgis # NOQA +from qgis.PyQt.QtCore import QLocale, QVariant from qgis.PyQt.QtGui import QValidator from qgis.core import QgsVectorLayer from qgis.gui import QgsFieldValidator from qgis.testing import start_app, unittest + from utilities import unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsfiledownloader.py b/tests/src/python/test_qgsfiledownloader.py index 956b3134e32d..1dc4b85ffcc3 100644 --- a/tests/src/python/test_qgsfiledownloader.py +++ b/tests/src/python/test_qgsfiledownloader.py @@ -13,8 +13,9 @@ import os import tempfile from functools import partial + from qgis.PyQt.QtCore import QEventLoop, QUrl -from qgis.core import (QgsFileDownloader, ) +from qgis.core import QgsFileDownloader from qgis.testing import start_app, unittest __author__ = 'Alessandro Pasotti' diff --git a/tests/src/python/test_qgsfileutils.py b/tests/src/python/test_qgsfileutils.py index ba33bb8496ce..4f0c40a450f8 100644 --- a/tests/src/python/test_qgsfileutils.py +++ b/tests/src/python/test_qgsfileutils.py @@ -9,18 +9,15 @@ __date__ = '18/12/2017' __copyright__ = 'Copyright 2017, The QGIS Project' +import os import shutil +import tempfile import qgis # NOQA - -import tempfile -import os -from qgis.core import ( - Qgis, - QgsFileUtils -) from qgis.PyQt.QtCore import QTemporaryDir +from qgis.core import Qgis, QgsFileUtils from qgis.testing import unittest + from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsfillsymbollayers.py b/tests/src/python/test_qgsfillsymbollayers.py index b8a996774aab..156e792348b4 100644 --- a/tests/src/python/test_qgsfillsymbollayers.py +++ b/tests/src/python/test_qgsfillsymbollayers.py @@ -11,19 +11,18 @@ import qgis # NOQA - -from qgis.testing import unittest from qgis.PyQt.QtCore import QDir -from qgis.PyQt.QtGui import (QImage, - QPainter, - QColor) -from qgis.core import (QgsRenderChecker, - QgsSimpleLineSymbolLayer, - QgsMapSettings, - QgsFillSymbol, - QgsGeometry, - QgsFeature, - QgsRenderContext) +from qgis.PyQt.QtGui import QColor, QImage, QPainter +from qgis.core import ( + QgsFeature, + QgsFillSymbol, + QgsGeometry, + QgsMapSettings, + QgsRenderChecker, + QgsRenderContext, + QgsSimpleLineSymbolLayer, +) +from qgis.testing import unittest class TestQgsFillSymbolLayers(unittest.TestCase): diff --git a/tests/src/python/test_qgsfloatingwidget.py b/tests/src/python/test_qgsfloatingwidget.py index bd88e643e839..a01248dd47db 100644 --- a/tests/src/python/test_qgsfloatingwidget.py +++ b/tests/src/python/test_qgsfloatingwidget.py @@ -10,10 +10,8 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA -from qgis.PyQt.QtWidgets import QWidget, QGridLayout - +from qgis.PyQt.QtWidgets import QGridLayout, QWidget from qgis.gui import QgsFloatingWidget - from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsfontbutton.py b/tests/src/python/test_qgsfontbutton.py index 96f81b98c931..18b991ffde80 100644 --- a/tests/src/python/test_qgsfontbutton.py +++ b/tests/src/python/test_qgsfontbutton.py @@ -10,12 +10,12 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtGui import QColor +from qgis.PyQt.QtTest import QSignalSpy from qgis.core import QgsTextFormat from qgis.gui import QgsFontButton, QgsMapCanvas from qgis.testing import start_app, unittest -from qgis.PyQt.QtGui import QColor, QFont -from qgis.PyQt.QtTest import QSignalSpy + from utilities import getTestFont start_app() diff --git a/tests/src/python/test_qgsfontmanager.py b/tests/src/python/test_qgsfontmanager.py index 0c9dcd981b47..f286fdec7e8a 100644 --- a/tests/src/python/test_qgsfontmanager.py +++ b/tests/src/python/test_qgsfontmanager.py @@ -10,25 +10,23 @@ __copyright__ = 'Copyright 2022, The QGIS Project' import os.path +import tempfile import qgis # NOQA - +from qgis.PyQt.QtCore import QCoreApplication, QUrl +from qgis.PyQt.QtGui import QFont +from qgis.PyQt.QtTest import QSignalSpy +from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( + QgsApplication, QgsFontManager, + QgsReadWriteContext, QgsSettings, - QgsApplication, QgsTextFormat, - QgsReadWriteContext ) -from qgis.PyQt.QtCore import QCoreApplication, QUrl -from qgis.PyQt.QtGui import QFont -from qgis.PyQt.QtTest import QSignalSpy -from qgis.PyQt.QtXml import QDomDocument - from qgis.testing import start_app, unittest -from utilities import unitTestDataPath -from utilities import getTestFont -import tempfile + +from utilities import getTestFont, unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsfontutils.py b/tests/src/python/test_qgsfontutils.py index 8d65ba4cad17..ac10c97213da 100644 --- a/tests/src/python/test_qgsfontutils.py +++ b/tests/src/python/test_qgsfontutils.py @@ -11,16 +11,11 @@ __date__ = '2014/02/19' __copyright__ = 'Copyright 2014, The QGIS Project' -from qgis.core import QgsFontUtils, QgsSettings -from qgis.testing import ( - start_app, - unittest -) from qgis.PyQt.QtCore import QCoreApplication -from utilities import ( - getTestFontFamily, - loadTestFonts -) +from qgis.core import QgsFontUtils, QgsSettings +from qgis.testing import start_app, unittest + +from utilities import getTestFontFamily, loadTestFonts class TestQgsFontUtils(unittest.TestCase): diff --git a/tests/src/python/test_qgsgeocoderalgorithm.py b/tests/src/python/test_qgsgeocoderalgorithm.py index 1024569c2a92..f76559014996 100644 --- a/tests/src/python/test_qgsgeocoderalgorithm.py +++ b/tests/src/python/test_qgsgeocoderalgorithm.py @@ -10,24 +10,23 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtCore import QVariant from qgis.analysis import QgsBatchGeocodeAlgorithm from qgis.core import ( + NULL, + QgsCoordinateReferenceSystem, + QgsFeature, + QgsField, + QgsFields, QgsGeocoderInterface, - QgsWkbTypes, QgsGeocoderResult, QgsGeometry, QgsPointXY, - QgsCoordinateReferenceSystem, - QgsFeature, QgsProcessingContext, QgsProcessingFeedback, QgsRectangle, - QgsField, - QgsFields, - NULL + QgsWkbTypes, ) -from qgis.PyQt.QtCore import QVariant from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsgeocoderlocatorfilter.py b/tests/src/python/test_qgsgeocoderlocatorfilter.py index 3d0b2e3a9c17..92de68e131a6 100644 --- a/tests/src/python/test_qgsgeocoderlocatorfilter.py +++ b/tests/src/python/test_qgsgeocoderlocatorfilter.py @@ -10,24 +10,19 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - from qgis.PyQt.QtTest import QSignalSpy from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsFeedback, QgsGeocoderInterface, - QgsWkbTypes, QgsGeocoderResult, QgsGeometry, - QgsPointXY, - QgsCoordinateReferenceSystem, QgsLocatorContext, - QgsFeedback, - QgsGeocoderContext, - QgsRectangle -) -from qgis.gui import ( - QgsMapCanvas, - QgsGeocoderLocatorFilter + QgsPointXY, + QgsRectangle, + QgsWkbTypes, ) +from qgis.gui import QgsGeocoderLocatorFilter, QgsMapCanvas from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsgeometry.py b/tests/src/python/test_qgsgeometry.py index d8460f4f44df..b96182647792 100644 --- a/tests/src/python/test_qgsgeometry.py +++ b/tests/src/python/test_qgsgeometry.py @@ -9,53 +9,54 @@ __date__ = '20/08/2012' __copyright__ = 'Copyright 2012, The QGIS Project' -import os import csv import math +import os +from qgis.PyQt.QtCore import QDir, QPointF +from qgis.PyQt.QtGui import ( + QBrush, + QColor, + QImage, + QPainter, + QPainterPath, + QPen, + QPolygonF, + QTransform, +) from qgis.core import ( - QgsGeometry, - QgsGeometryParameters, - QgsVectorLayer, - QgsFeature, - QgsPointXY, - QgsPoint, + Qgis, + QgsAbstractGeometryTransformer, + QgsCircle, QgsCircularString, QgsCompoundCurve, + QgsCoordinateReferenceSystem, + QgsCoordinateTransform, QgsCurvePolygon, + QgsFeature, + QgsGeometry, QgsGeometryCollection, + QgsGeometryParameters, QgsLineString, QgsMultiCurve, QgsMultiLineString, QgsMultiPoint, QgsMultiPolygon, QgsMultiSurface, + QgsPoint, + QgsPointXY, QgsPolygon, - QgsCoordinateTransform, + QgsProject, QgsRectangle, - QgsWkbTypes, - QgsTriangle, QgsRenderChecker, - QgsCoordinateReferenceSystem, - QgsProject, + QgsTriangle, + QgsVectorLayer, QgsVertexId, - QgsAbstractGeometryTransformer, - QgsCircle, - Qgis -) -from qgis.PyQt.QtCore import QDir, QPointF, QRectF -from qgis.PyQt.QtGui import QImage, QPainter, QPen, QColor, QBrush, QPainterPath, QPolygonF, QTransform - -from qgis.testing import ( - start_app, - unittest, + QgsWkbTypes, ) +from qgis.testing import start_app, unittest -from utilities import ( - compareWkt, - unitTestDataPath, - writeShape -) +from utilities import compareWkt, unitTestDataPath, writeShape # Convenience instances in case you may need them not used in this test diff --git a/tests/src/python/test_qgsgeometry_avoid_intersections.py b/tests/src/python/test_qgsgeometry_avoid_intersections.py index dbc4062b09d3..bb2d969e870e 100644 --- a/tests/src/python/test_qgsgeometry_avoid_intersections.py +++ b/tests/src/python/test_qgsgeometry_avoid_intersections.py @@ -11,11 +11,9 @@ import qgis # NOQA -from qgis.core import QgsVectorLayer, QgsFeature, QgsGeometry - +from qgis.core import QgsFeature, QgsGeometry, QgsVectorLayer from qgis.testing import start_app, unittest - feat_wkt = [ "POLYGON((11564467.4556225873529911 1004058.0506714906077832,11574000.25562258623540401 1001788.33638577628880739,11573173.43113279156386852 993520.09148781711701304,11573092.36990830115973949 992709.47924291924573481,11572184.48419401608407497 986808.22210006206296384,11569460.82705115899443626 977275.42210006201639771,11570059.38887163810431957 972187.64662597852293402,11570368.71276544407010078 969558.39352863351814449,11567645.05562258698046207 962749.25067149056121707,11561743.79847973026335239 965472.9078143477672711,11562197.74133687280118465 972735.99352863349486142,11562651.68419401533901691 980453.02210006199311465,11562197.74133687280118465 991801.59352863347157836,11564467.4556225873529911 1004058.0506714906077832))", "POLYGON((11585348.82705115899443626 1001788.33638577628880739,11595335.56990830041468143 1000426.50781434774398804,11598967.11276544444262981 994525.25067149056121707,11596726.68511567451059818 987803.96772218181286007,11594881.62705115787684917 982268.79352863342501223,11596210.5081571489572525 973631.06633969338145107,11596697.39847972989082336 970466.27924291917588562,11596243.4556225873529911 956847.99352863349486142,11589241.51456319727003574 957431.48861691600177437,11585348.82705115899443626 957755.87924291915260255,11583079.11276544444262981 965472.9078143477672711,11584503.3406173400580883 970315.28251079504843801,11585348.82705115899443626 973189.93638577638193965,11585802.76990830153226852 980906.96495720488019288,11585348.82705115899443626 991801.59352863347157836,11585348.82705115899443626 992546.05981434776913375,11585348.82705115899443626 999405.1363857762189582,11585348.82705115899443626 1001788.33638577628880739))", diff --git a/tests/src/python/test_qgsgeometrygeneratorsymbollayer.py b/tests/src/python/test_qgsgeometrygeneratorsymbollayer.py index 61f69604a814..c82ce0b3ef66 100644 --- a/tests/src/python/test_qgsgeometrygeneratorsymbollayer.py +++ b/tests/src/python/test_qgsgeometrygeneratorsymbollayer.py @@ -19,41 +19,40 @@ __date__ = 'December 2015' __copyright__ = '(C) 2015, Matthias Kuhn' -import qgis # NOQA - import os -from qgis.PyQt.QtCore import QSize, QDir, QPointF +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QPointF, QSize from qgis.PyQt.QtGui import QColor, QImage, QPainter, QPolygonF from qgis.core import ( - QgsVectorLayer, - QgsSingleSymbolRenderer, - QgsFillSymbol, - QgsLineSymbol, - QgsMarkerSymbol, - QgsProject, - QgsRectangle, - QgsGeometryGeneratorSymbolLayer, - QgsSymbol, - QgsMultiRenderChecker, - QgsMapSettings, Qgis, - QgsUnitTypes, - QgsRenderContext, - QgsRenderChecker, + QgsArrowSymbolLayer, QgsCoordinateReferenceSystem, QgsCoordinateTransform, - QgsArrowSymbolLayer, QgsFeature, - QgsGeometry, + QgsFillSymbol, QgsFontMarkerSymbolLayer, QgsFontUtils, + QgsGeometry, + QgsGeometryGeneratorSymbolLayer, + QgsLineSymbol, + QgsMapSettings, + QgsMarkerSymbol, + QgsMultiRenderChecker, + QgsProject, + QgsProperty, + QgsRectangle, + QgsRenderChecker, + QgsRenderContext, + QgsSingleSymbolRenderer, + QgsSymbol, QgsSymbolLayer, - QgsProperty + QgsUnitTypes, + QgsVectorLayer, ) - from qgis.testing import start_app, unittest from qgis.testing.mocked import get_iface + from utilities import unitTestDataPath # Convenience instances in case you may need them diff --git a/tests/src/python/test_qgsgeometryvalidator.py b/tests/src/python/test_qgsgeometryvalidator.py index c9f17bd1eafa..999f21d736d0 100644 --- a/tests/src/python/test_qgsgeometryvalidator.py +++ b/tests/src/python/test_qgsgeometryvalidator.py @@ -9,18 +9,9 @@ __date__ = '03/10/2016' __copyright__ = 'Copyright 2016, The QGIS Project' -from qgis.core import ( - QgsGeometry, - QgsGeometryValidator, - QgsPointXY -) - -from qgis.testing import ( - unittest, - start_app -) - from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import QgsGeometry, QgsGeometryValidator, QgsPointXY +from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgsgooglemapsgeocoder.py b/tests/src/python/test_qgsgooglemapsgeocoder.py index 9997745dcea3..922940e3ab18 100644 --- a/tests/src/python/test_qgsgooglemapsgeocoder.py +++ b/tests/src/python/test_qgsgooglemapsgeocoder.py @@ -12,16 +12,13 @@ import tempfile import qgis # NOQA -from qgis.PyQt.QtCore import ( - QCoreApplication, - QUrl -) +from qgis.PyQt.QtCore import QCoreApplication, QUrl from qgis.core import ( - QgsSettings, - QgsRectangle, - QgsGoogleMapsGeocoder, + QgsCoordinateTransformContext, QgsGeocoderContext, - QgsCoordinateTransformContext + QgsGoogleMapsGeocoder, + QgsRectangle, + QgsSettings, ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsgpslogger.py b/tests/src/python/test_qgsgpslogger.py index fcfd6fd97272..ff4a5b2ce89c 100644 --- a/tests/src/python/test_qgsgpslogger.py +++ b/tests/src/python/test_qgsgpslogger.py @@ -10,22 +10,17 @@ __copyright__ = 'Copyright 2022, The QGIS Project' import qgis # NOQA -from qgis.PyQt.QtCore import ( - Qt, - QBuffer, - QDateTime, - QCoreApplication -) +from qgis.PyQt.QtCore import QBuffer, QCoreApplication, QDateTime from qgis.PyQt.QtTest import QSignalSpy from qgis.core import ( + NULL, Qgis, QgsGpsLogger, - QgsVectorLayerGpsLogger, - QgsVectorLayer, QgsNmeaConnection, QgsSettings, + QgsVectorLayer, + QgsVectorLayerGpsLogger, QgsWkbTypes, - NULL ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsgraduatedsymbolrenderer.py b/tests/src/python/test_qgsgraduatedsymbolrenderer.py index 591eeffe856c..2260e9376b65 100644 --- a/tests/src/python/test_qgsgraduatedsymbolrenderer.py +++ b/tests/src/python/test_qgsgraduatedsymbolrenderer.py @@ -10,23 +10,23 @@ __copyright__ = 'Copyright 2014, The QGIS Project' import qgis # NOQA - -from qgis.testing import unittest, start_app -from qgis.core import (QgsGraduatedSymbolRenderer, - QgsRendererRange, - QgsRendererRangeLabelFormat, - QgsMarkerSymbol, - QgsGradientColorRamp, - QgsVectorLayer, - QgsFeature, - QgsGeometry, - QgsPointXY, - QgsReadWriteContext, - QgsRenderContext - ) from qgis.PyQt.QtCore import Qt -from qgis.PyQt.QtXml import QDomDocument from qgis.PyQt.QtGui import QColor +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsFeature, + QgsGeometry, + QgsGradientColorRamp, + QgsGraduatedSymbolRenderer, + QgsMarkerSymbol, + QgsPointXY, + QgsReadWriteContext, + QgsRenderContext, + QgsRendererRange, + QgsRendererRangeLabelFormat, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsgraph.py b/tests/src/python/test_qgsgraph.py index 3dae184f83d7..d30916d232af 100644 --- a/tests/src/python/test_qgsgraph.py +++ b/tests/src/python/test_qgsgraph.py @@ -10,12 +10,9 @@ __copyright__ = 'Copyright 2021, The QGIS Project' import qgis # NOQA -from qgis.analysis import ( - QgsGraph -) -from qgis.core import ( - QgsPointXY -) + +from qgis.analysis import QgsGraph +from qgis.core import QgsPointXY from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsgrouplayer.py b/tests/src/python/test_qgsgrouplayer.py index f448ddbdc4c5..f994bccca12d 100644 --- a/tests/src/python/test_qgsgrouplayer.py +++ b/tests/src/python/test_qgsgrouplayer.py @@ -9,41 +9,31 @@ __date__ = '22/11/2021' __copyright__ = 'Copyright 2021, The QGIS Project' -import qgis # NOQA - -import tempfile import os -import gc -from qgis.PyQt.QtCore import ( - QCoreApplication, - QEvent, - QSize, - QDir -) -from qgis.PyQt.QtGui import ( - QPainter, - QColor -) from tempfile import TemporaryDirectory +import qgis # NOQA +from qgis.PyQt.QtCore import QCoreApplication, QDir, QEvent, QSize +from qgis.PyQt.QtGui import QColor, QPainter from qgis.core import ( - QgsFeature, - QgsVectorLayer, - QgsRasterLayer, - QgsProject, + QgsColorEffect, QgsCoordinateTransformContext, - QgsGroupLayer, + QgsDrawSourceEffect, + QgsDropShadowEffect, + QgsEffectStack, + QgsFeature, QgsGeometry, - QgsPointXY, + QgsGroupLayer, + QgsImageOperation, QgsMapSettings, QgsMultiRenderChecker, - QgsDropShadowEffect, - QgsEffectStack, - QgsDrawSourceEffect, - QgsColorEffect, - QgsImageOperation + QgsPointXY, + QgsProject, + QgsRasterLayer, + QgsVectorLayer, ) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgshashlinesymbollayer.py b/tests/src/python/test_qgshashlinesymbollayer.py index 308bc546374e..f5787e57c744 100644 --- a/tests/src/python/test_qgshashlinesymbollayer.py +++ b/tests/src/python/test_qgshashlinesymbollayer.py @@ -19,44 +19,38 @@ __date__ = 'March 2019' __copyright__ = '(C) 2019, Nyall Dawson' -import qgis # NOQA - import os -from utilities import unitTestDataPath -from qgis.PyQt.QtCore import QDir, Qt, QSize -from qgis.PyQt.QtGui import QImage, QColor, QPainter +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QSize +from qgis.PyQt.QtGui import QColor, QImage, QPainter from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsFeature, + QgsFillSymbol, + QgsGeometry, + QgsHashedLineSymbolLayer, + QgsLineSymbol, + QgsLineSymbolLayer, + QgsMapSettings, + QgsMultiRenderChecker, + QgsProperty, + QgsReadWriteContext, + QgsRectangle, + QgsRenderChecker, + QgsRenderContext, + QgsSimpleLineSymbolLayer, + QgsSingleSymbolRenderer, + QgsSymbol, + QgsSymbolLayer, + QgsSymbolLayerUtils, + QgsTemplatedLineSymbolLayerBase, + QgsUnitTypes, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest -from qgis.core import (QgsGeometry, - QgsFillSymbol, - QgsRenderContext, - QgsFeature, - QgsMapSettings, - QgsRenderChecker, - QgsReadWriteContext, - QgsSymbolLayerUtils, - QgsSimpleMarkerSymbolLayer, - QgsLineSymbolLayer, - QgsMarkerLineSymbolLayer, - QgsMarkerSymbol, - QgsGeometryGeneratorSymbolLayer, - QgsSymbol, - QgsFontMarkerSymbolLayer, - QgsMultiRenderChecker, - QgsLineSymbol, - QgsSymbolLayer, - QgsProperty, - QgsRectangle, - QgsUnitTypes, - QgsSimpleLineSymbolLayer, - QgsTemplatedLineSymbolLayerBase, - QgsHashedLineSymbolLayer, - QgsVectorLayer, - QgsSingleSymbolRenderer - ) - -from qgis.testing import unittest, start_app +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgshelp.py b/tests/src/python/test_qgshelp.py index b72f69c91031..b7c9cc014e5f 100644 --- a/tests/src/python/test_qgshelp.py +++ b/tests/src/python/test_qgshelp.py @@ -12,10 +12,10 @@ __copyright__ = 'Copyright 2022, Julien Cabieces' from qgis.PyQt.QtCore import QCoreApplication - from qgis.core import QgsSettings from qgis.gui import QgsHelp from qgis.testing import start_app, unittest + import mockedwebserver diff --git a/tests/src/python/test_qgshighlight.py b/tests/src/python/test_qgshighlight.py index 192a6ad75e8d..247680d21214 100644 --- a/tests/src/python/test_qgshighlight.py +++ b/tests/src/python/test_qgshighlight.py @@ -9,42 +9,29 @@ __date__ = '8.11.2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA import os -import tempfile import shutil +import tempfile -from qgis.PyQt.QtCore import ( - QSize, - Qt, - QDir, - -) -from qgis.PyQt.QtGui import ( - QColor, - QImage, - QPainter, - QResizeEvent, - QPixmap -) +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QSize, Qt +from qgis.PyQt.QtGui import QColor, QImage, QPainter, QResizeEvent from qgis.core import ( - QgsVectorLayer, + QgsCoordinateReferenceSystem, + QgsFillSymbol, + QgsGeometryGeneratorSymbolLayer, + QgsMultiRenderChecker, QgsProject, QgsRectangle, QgsRenderChecker, - QgsCoordinateReferenceSystem, - QgsMultiRenderChecker, - QgsGeometryGeneratorSymbolLayer, - QgsFillSymbol, QgsSingleSymbolRenderer, - QgsSymbol -) -from qgis.gui import ( - QgsHighlight, - QgsMapCanvas + QgsSymbol, + QgsVectorLayer, ) +from qgis.gui import QgsHighlight, QgsMapCanvas from qgis.testing import start_app, unittest from qgis.testing.mocked import get_iface + from utilities import unitTestDataPath app = start_app() diff --git a/tests/src/python/test_qgshistoryproviderregistry.py b/tests/src/python/test_qgshistoryproviderregistry.py index 97dae72f05c8..8f854429b816 100644 --- a/tests/src/python/test_qgshistoryproviderregistry.py +++ b/tests/src/python/test_qgshistoryproviderregistry.py @@ -10,19 +10,14 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA switch sip api - from qgis.PyQt import sip -from qgis.PyQt.QtCore import ( - QDateTime, - QDate -) +from qgis.PyQt.QtCore import QDate, QDateTime from qgis.core import Qgis from qgis.gui import ( + QgsAbstractHistoryProvider, QgsHistoryEntry, QgsHistoryProviderRegistry, - QgsAbstractHistoryProvider ) - from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsimagecache.py b/tests/src/python/test_qgsimagecache.py index 279ae7db9db6..3b7a5237b890 100644 --- a/tests/src/python/test_qgsimagecache.py +++ b/tests/src/python/test_qgsimagecache.py @@ -9,18 +9,22 @@ __date__ = '02/10/2018' __copyright__ = 'Copyright 2018, The QGIS Project' -import qgis # NOQA - +import http.server import os import socketserver import threading -import http.server import time -from qgis.PyQt.QtCore import QDir, QCoreApplication, QSize -from qgis.PyQt.QtGui import QColor, QImage, QPainter -from qgis.core import (QgsImageCache, QgsRenderChecker, QgsApplication, QgsMultiRenderChecker) +import qgis # NOQA +from qgis.PyQt.QtCore import QCoreApplication, QDir, QSize +from qgis.PyQt.QtGui import QImage, QPainter +from qgis.core import ( + QgsApplication, + QgsMultiRenderChecker, + QgsRenderChecker, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsimagesourcelineedit.py b/tests/src/python/test_qgsimagesourcelineedit.py index 2449e2da0d5f..989ebcd1f20e 100644 --- a/tests/src/python/test_qgsimagesourcelineedit.py +++ b/tests/src/python/test_qgsimagesourcelineedit.py @@ -9,14 +9,14 @@ __date__ = '5/12/2018' __copyright__ = 'Copyright 2018, The QGIS Project' -import qgis # NOQA import os -from qgis.gui import QgsImageSourceLineEdit +import qgis # NOQA from qgis.PyQt.QtTest import QSignalSpy +from qgis.gui import QgsImageSourceLineEdit from qgis.testing import start_app, unittest -from utilities import unitTestDataPath +from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsinterpolatedlinesymbollayers.py b/tests/src/python/test_qgsinterpolatedlinesymbollayers.py index 025c0e98bba9..1aa9870d8141 100644 --- a/tests/src/python/test_qgsinterpolatedlinesymbollayers.py +++ b/tests/src/python/test_qgsinterpolatedlinesymbollayers.py @@ -11,27 +11,24 @@ import qgis # NOQA - +from qgis.PyQt.QtCore import QDir, QPointF +from qgis.PyQt.QtGui import QColor, QImage, QPainter, QPolygonF +from qgis.core import ( + QgsColorRampShader, + QgsFeature, + QgsGeometry, + QgsInterpolatedLineColor, + QgsInterpolatedLineSymbolLayer, + QgsInterpolatedLineWidth, + QgsLineSymbol, + QgsMapSettings, + QgsProperty, + QgsRenderChecker, + QgsRenderContext, + QgsStyle, + QgsSymbolLayer, +) from qgis.testing import unittest -from qgis.PyQt.QtCore import (QDir, - QPointF) -from qgis.PyQt.QtGui import (QImage, - QPainter, - QColor, - QPolygonF) -from qgis.core import (QgsRenderChecker, - QgsInterpolatedLineSymbolLayer, - QgsInterpolatedLineWidth, - QgsInterpolatedLineColor, - QgsColorRampShader, - QgsStyle, - QgsMapSettings, - QgsLineSymbol, - QgsGeometry, - QgsFeature, - QgsRenderContext, - QgsSymbolLayer, - QgsProperty) class TestQgsLineSymbolLayers(unittest.TestCase): diff --git a/tests/src/python/test_qgsissue7244.py b/tests/src/python/test_qgsissue7244.py index 39f545434582..6d541ed7af7c 100644 --- a/tests/src/python/test_qgsissue7244.py +++ b/tests/src/python/test_qgsissue7244.py @@ -9,14 +9,11 @@ __date__ = '09/07/2013' __copyright__ = 'Copyright 2013, The QGIS Project' -import qgis # NOQA - import os +import qgis # NOQA from qgis.core import QgsPointXY, QgsVectorLayer - from qgis.testing import start_app, unittest - from qgis.utils import spatialite_connect # Convenience instances in case you may need them diff --git a/tests/src/python/test_qgsjsonutils.py b/tests/src/python/test_qgsjsonutils.py index 18b02608b41c..4f2903875e43 100644 --- a/tests/src/python/test_qgsjsonutils.py +++ b/tests/src/python/test_qgsjsonutils.py @@ -10,25 +10,25 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - -from qgis.testing import unittest, start_app -from qgis.core import (QgsJsonUtils, - QgsJsonExporter, - QgsCoordinateReferenceSystem, - QgsProject, - QgsFeature, - QgsField, - QgsFields, - QgsWkbTypes, - QgsGeometry, - QgsPoint, - QgsLineString, - NULL, - QgsVectorLayer, - QgsRelation, - QgsEditorWidgetSetup - ) -from qgis.PyQt.QtCore import QVariant, QTextCodec, QLocale, Qt +from qgis.PyQt.QtCore import QLocale, Qt, QTextCodec, QVariant +from qgis.core import ( + NULL, + QgsCoordinateReferenceSystem, + QgsEditorWidgetSetup, + QgsFeature, + QgsField, + QgsFields, + QgsGeometry, + QgsJsonExporter, + QgsJsonUtils, + QgsLineString, + QgsPoint, + QgsProject, + QgsRelation, + QgsVectorLayer, + QgsWkbTypes, +) +from qgis.testing import start_app, unittest start_app() codec = QTextCodec.codecForName("System") diff --git a/tests/src/python/test_qgslabellinesettings.py b/tests/src/python/test_qgslabellinesettings.py index a0310d2629e7..4f4caab94692 100644 --- a/tests/src/python/test_qgslabellinesettings.py +++ b/tests/src/python/test_qgslabellinesettings.py @@ -9,20 +9,21 @@ __date__ = '2019-12-07' __copyright__ = 'Copyright 2019, The QGIS Project' -import qgis # NOQA import os -from qgis.core import (QgsProperty, - QgsPropertyCollection, - QgsPalLayerSettings, - QgsLabelLineSettings, - QgsExpressionContext, - QgsExpressionContextScope, - QgsUnitTypes, - QgsMapUnitScale, - QgsLabeling) - -from qgis.testing import unittest, start_app +import qgis # NOQA +from qgis.core import ( + QgsExpressionContext, + QgsExpressionContextScope, + QgsLabeling, + QgsLabelLineSettings, + QgsMapUnitScale, + QgsPalLayerSettings, + QgsProperty, + QgsPropertyCollection, + QgsUnitTypes, +) +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslabelobstaclesettings.py b/tests/src/python/test_qgslabelobstaclesettings.py index 15c9c36460f6..01ff7241cd95 100644 --- a/tests/src/python/test_qgslabelobstaclesettings.py +++ b/tests/src/python/test_qgslabelobstaclesettings.py @@ -11,15 +11,16 @@ import qgis # NOQA -from qgis.core import (QgsProperty, - QgsPropertyCollection, - QgsPalLayerSettings, - QgsLabelObstacleSettings, - QgsExpressionContext, - QgsExpressionContextScope, - QgsGeometry) - -from qgis.testing import unittest, start_app +from qgis.core import ( + QgsExpressionContext, + QgsExpressionContextScope, + QgsGeometry, + QgsLabelObstacleSettings, + QgsPalLayerSettings, + QgsProperty, + QgsPropertyCollection, +) +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslabelsettingswidget.py b/tests/src/python/test_qgslabelsettingswidget.py index a5c9891a8251..937ad173c82e 100644 --- a/tests/src/python/test_qgslabelsettingswidget.py +++ b/tests/src/python/test_qgslabelsettingswidget.py @@ -10,16 +10,15 @@ __copyright__ = 'Copyright 2019, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsPropertyCollection, - QgsPalLayerSettings, - QgsLabelObstacleSettings, - QgsProperty) -from qgis.gui import (QgsLabelSettingsWidgetBase, - QgsLabelObstacleSettingsWidget) - -from qgis.testing import start_app, unittest from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import ( + QgsLabelObstacleSettings, + QgsPalLayerSettings, + QgsProperty, + QgsPropertyCollection, +) +from qgis.gui import QgsLabelObstacleSettingsWidget, QgsLabelSettingsWidgetBase +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslabelthinningsettings.py b/tests/src/python/test_qgslabelthinningsettings.py index 1b6a3957e60d..a97269399aa0 100644 --- a/tests/src/python/test_qgslabelthinningsettings.py +++ b/tests/src/python/test_qgslabelthinningsettings.py @@ -11,10 +11,8 @@ import qgis # NOQA -from qgis.core import (QgsPalLayerSettings, - QgsLabelThinningSettings) - -from qgis.testing import unittest, start_app +from qgis.core import QgsLabelThinningSettings, QgsPalLayerSettings +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslayerdefinition.py b/tests/src/python/test_qgslayerdefinition.py index 7ffe6625822f..734dc9a69b52 100644 --- a/tests/src/python/test_qgslayerdefinition.py +++ b/tests/src/python/test_qgslayerdefinition.py @@ -11,20 +11,15 @@ import os import shutil -import qgis # NOQA -from qgis.core import (QgsProject, - QgsLayerDefinition, - QgsVectorLayer, - Qgis - ) +import qgis # NOQA +from qgis.PyQt.QtCore import QTemporaryDir +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import Qgis, QgsLayerDefinition, QgsProject, QgsVectorLayer +from qgis.testing import start_app, unittest -from qgis.testing import unittest, start_app from utilities import unitTestDataPath -from qgis.PyQt.QtXml import QDomDocument -from qgis.PyQt.QtCore import QTemporaryDir - start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayermetadata.py b/tests/src/python/test_qgslayermetadata.py index 9565b1a5f04a..291609a778ab 100644 --- a/tests/src/python/test_qgslayermetadata.py +++ b/tests/src/python/test_qgslayermetadata.py @@ -12,19 +12,16 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtCore import QDate, QDateTime, QRegularExpression, QTime from qgis.PyQt.QtXml import QDomDocument - -from qgis.core import (QgsLayerMetadata, - QgsCoordinateReferenceSystem, - QgsVectorLayer, - QgsNativeMetadataValidator, - QgsBox3d, - QgsDateTimeRange) -from qgis.PyQt.QtCore import (QDate, - QTime, - QDateTime, - QRegularExpression,) +from qgis.core import ( + QgsBox3d, + QgsCoordinateReferenceSystem, + QgsDateTimeRange, + QgsLayerMetadata, + QgsNativeMetadataValidator, + QgsVectorLayer, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslayermetadataprovider_ogr.py b/tests/src/python/test_qgslayermetadataprovider_ogr.py index 0110c6e6f719..a32306efb4db 100644 --- a/tests/src/python/test_qgslayermetadataprovider_ogr.py +++ b/tests/src/python/test_qgslayermetadataprovider_ogr.py @@ -14,14 +14,14 @@ import os import shutil -from qgis.core import ( - QgsVectorLayer, - QgsProviderRegistry, -) - from qgis.PyQt.QtCore import QTemporaryDir +from qgis.core import QgsProviderRegistry, QgsVectorLayer from qgis.testing import unittest -from qgslayermetadataprovidertestbase import LayerMetadataProviderTestBase, TEST_DATA_DIR + +from qgslayermetadataprovidertestbase import ( + TEST_DATA_DIR, + LayerMetadataProviderTestBase, +) class TestPostgresLayerMetadataProvider(unittest.TestCase, LayerMetadataProviderTestBase): diff --git a/tests/src/python/test_qgslayermetadataprovider_postgres.py b/tests/src/python/test_qgslayermetadataprovider_postgres.py index 5802c691585e..cada961cc74d 100644 --- a/tests/src/python/test_qgslayermetadataprovider_postgres.py +++ b/tests/src/python/test_qgslayermetadataprovider_postgres.py @@ -13,12 +13,9 @@ import os -from qgis.core import ( - QgsVectorLayer, - QgsProviderRegistry, -) - +from qgis.core import QgsProviderRegistry, QgsVectorLayer from qgis.testing import unittest + from qgslayermetadataprovidertestbase import LayerMetadataProviderTestBase diff --git a/tests/src/python/test_qgslayermetadataprovider_postgresraster.py b/tests/src/python/test_qgslayermetadataprovider_postgresraster.py index 037e678c7d66..a3eae1f8077b 100644 --- a/tests/src/python/test_qgslayermetadataprovider_postgresraster.py +++ b/tests/src/python/test_qgslayermetadataprovider_postgresraster.py @@ -13,13 +13,9 @@ import os -from qgis.core import ( - QgsRasterLayer, - QgsProviderRegistry, -) - -from qgis.PyQt.QtCore import QCoreApplication +from qgis.core import QgsProviderRegistry, QgsRasterLayer from qgis.testing import unittest + from qgslayermetadataprovidertestbase import LayerMetadataProviderTestBase diff --git a/tests/src/python/test_qgslayermetadataprovider_python.py b/tests/src/python/test_qgslayermetadataprovider_python.py index d1ed7763bd38..233e47ca3672 100644 --- a/tests/src/python/test_qgslayermetadataprovider_python.py +++ b/tests/src/python/test_qgslayermetadataprovider_python.py @@ -16,24 +16,24 @@ from functools import partial from stat import S_IREAD, S_IRGRP, S_IROTH, S_IWUSR +from qgis.PyQt.QtCore import QTemporaryDir +from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( - QgsPolygon, - QgsWkbTypes, - QgsRectangle, - QgsMapLayerType, - QgsProviderRegistry, QgsAbstractLayerMetadataProvider, - QgsLayerMetadataSearchResults, + QgsLayerMetadata, QgsLayerMetadataProviderResult, + QgsLayerMetadataSearchResults, + QgsMapLayerType, QgsMetadataSearchContext, - QgsLayerMetadata, QgsNotSupportedException, + QgsPolygon, QgsProviderConnectionException, + QgsProviderRegistry, + QgsRectangle, + QgsWkbTypes, ) +from qgis.testing import start_app, unittest -from qgis.PyQt.QtCore import QTemporaryDir -from qgis.PyQt.QtXml import QDomDocument -from qgis.testing import unittest, start_app from utilities import unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayermetadataresultsmodel.py b/tests/src/python/test_qgslayermetadataresultsmodel.py index 1abd18b0762b..3aa73bab482c 100644 --- a/tests/src/python/test_qgslayermetadataresultsmodel.py +++ b/tests/src/python/test_qgslayermetadataresultsmodel.py @@ -12,36 +12,31 @@ __copyright__ = 'Copyright 2022, ItOpen' import os -from osgeo import ogr +import unittest +from osgeo import ogr +from qgis.PyQt.QtCore import QCoreApplication, Qt, QTemporaryDir, QVariant +from qgis.PyQt.QtTest import QAbstractItemModelTester from qgis.core import ( - QgsVectorLayer, - QgsProviderRegistry, - QgsWkbTypes, - QgsMapLayerType, - QgsLayerMetadata, - QgsProviderMetadata, QgsBox3d, - QgsRectangle, - QgsMetadataSearchContext, - QgsFields, - QgsField, QgsCoordinateReferenceSystem, QgsFeature, + QgsField, + QgsFields, QgsGeometry, + QgsLayerMetadata, + QgsMetadataSearchContext, + QgsProviderMetadata, + QgsProviderRegistry, + QgsRectangle, + QgsVectorLayer, + QgsWkbTypes, ) - from qgis.gui import ( QgsLayerMetadataResultsModel, QgsLayerMetadataResultsProxyModel, ) - -from qgis.PyQt.QtTest import QAbstractItemModelTester - -from qgis.PyQt.QtCore import QCoreApplication, QTemporaryDir, QVariant, Qt -from utilities import compareWkt, unitTestDataPath -from qgis.testing import start_app, TestCase -import unittest +from qgis.testing import TestCase, start_app QGIS_APP = start_app() NUM_LAYERS = 20 diff --git a/tests/src/python/test_qgslayertree.py b/tests/src/python/test_qgslayertree.py index b98d9c825637..5f1fde5134e4 100644 --- a/tests/src/python/test_qgslayertree.py +++ b/tests/src/python/test_qgslayertree.py @@ -9,28 +9,24 @@ __date__ = '22.3.2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA - import os +from tempfile import TemporaryDirectory +import qgis # NOQA +from qgis.PyQt.QtCore import QCoreApplication, QDir, QEvent +from qgis.PyQt.QtTest import QSignalSpy from qgis.core import ( + QgsCoordinateTransformContext, + QgsGroupLayer, QgsLayerTree, + QgsLayerTreeGroup, + QgsLayerTreeLayer, QgsProject, QgsVectorLayer, - QgsLayerTreeLayer, - QgsLayerTreeGroup, - QgsGroupLayer, - QgsCoordinateTransformContext ) from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath) -from qgis.PyQt.QtTest import QSignalSpy -from qgis.PyQt.QtCore import ( - QDir, - QCoreApplication, - QEvent -) -from tempfile import TemporaryDirectory + +from utilities import unitTestDataPath app = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayertreemapcanvasbridge.py b/tests/src/python/test_qgslayertreemapcanvasbridge.py index f050ce96bad3..df3abf02f5aa 100644 --- a/tests/src/python/test_qgslayertreemapcanvasbridge.py +++ b/tests/src/python/test_qgslayertreemapcanvasbridge.py @@ -9,20 +9,19 @@ __date__ = '8/03/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import os - import qgis # NOQA - -from qgis.core import (QgsProject, - QgsApplication, - QgsUnitTypes, - QgsCoordinateReferenceSystem, - QgsVectorLayer) -from qgis.gui import (QgsLayerTreeMapCanvasBridge, - QgsMapCanvas, - QgsCustomLayerOrderWidget) +from qgis.core import ( + QgsProject, + QgsVectorLayer, +) +from qgis.gui import ( + QgsCustomLayerOrderWidget, + QgsLayerTreeMapCanvasBridge, + QgsMapCanvas, +) from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath) + +from utilities import unitTestDataPath app = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayertreeview.py b/tests/src/python/test_qgslayertreeview.py index b15685a5673d..e382359ef5d8 100644 --- a/tests/src/python/test_qgslayertreeview.py +++ b/tests/src/python/test_qgslayertreeview.py @@ -10,25 +10,18 @@ __copyright__ = 'Copyright 2018, The QGIS Project' import qgis # NOQA - -import os - +from qgis.PyQt.QtCore import QStringListModel +from qgis.PyQt.QtTest import QAbstractItemModelTester, QSignalSpy from qgis.core import ( + QgsLayerTree, QgsLayerTreeModel, QgsProject, QgsVectorLayer, - QgsLayerTreeLayer, - QgsLayerTree, -) -from qgis.gui import ( - QgsLayerTreeView, - QgsLayerTreeViewDefaultActions, ) +from qgis.gui import QgsLayerTreeView, QgsLayerTreeViewDefaultActions from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath) -from qgis.PyQt.QtCore import QStringListModel -from qgis.PyQt.QtTest import QSignalSpy, QAbstractItemModelTester -from qgis.PyQt.Qt import PYQT_VERSION_STR + +from utilities import unitTestDataPath app = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayout.py b/tests/src/python/test_qgslayout.py index e663528701aa..53a7b6ac157b 100644 --- a/tests/src/python/test_qgslayout.py +++ b/tests/src/python/test_qgslayout.py @@ -9,36 +9,33 @@ __date__ = '18/07/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA -from qgis.PyQt import sip -import tempfile -import shutil import os +import shutil +import tempfile -from qgis.core import (QgsUnitTypes, - QgsLayout, - QgsLayoutItemPage, - QgsLayoutGuide, - QgsLayoutObject, - QgsProject, - QgsPrintLayout, - QgsLayoutItemGroup, - QgsLayoutItem, - QgsLayoutItemHtml, - QgsProperty, - QgsLayoutPageCollection, - QgsLayoutMeasurement, - QgsLayoutFrame, - QgsFillSymbol, - QgsReadWriteContext, - QgsLayoutItemMap, - QgsLayoutItemLabel, - QgsLayoutSize, - QgsLayoutPoint) -from qgis.PyQt.QtCore import Qt, QCoreApplication, QEvent, QPointF, QRectF +import qgis # NOQA +from qgis.PyQt import sip +from qgis.PyQt.QtCore import QPointF, Qt from qgis.PyQt.QtTest import QSignalSpy from qgis.PyQt.QtXml import QDomDocument - +from qgis.core import ( + QgsLayout, + QgsLayoutFrame, + QgsLayoutGuide, + QgsLayoutItem, + QgsLayoutItemGroup, + QgsLayoutItemHtml, + QgsLayoutItemLabel, + QgsLayoutItemMap, + QgsLayoutItemPage, + QgsLayoutMeasurement, + QgsLayoutPoint, + QgsLayoutSize, + QgsPrintLayout, + QgsProject, + QgsReadWriteContext, + QgsUnitTypes, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslayoutaligner.py b/tests/src/python/test_qgslayoutaligner.py index 91a769731637..d13ceb61e3dd 100644 --- a/tests/src/python/test_qgslayoutaligner.py +++ b/tests/src/python/test_qgslayoutaligner.py @@ -10,26 +10,17 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA -from qgis.PyQt import sip - -from qgis.core import (QgsUnitTypes, - QgsLayout, - QgsLayoutAligner, - QgsLayoutItemPage, - QgsLayoutGuide, - QgsLayoutObject, - QgsProject, - QgsProperty, - QgsLayoutPageCollection, - QgsLayoutMeasurement, - QgsLayoutItemPicture, - QgsLayoutSize, - QgsLayoutPoint, - QgsLayoutItem) -from qgis.PyQt.QtCore import Qt, QCoreApplication, QEvent, QPointF, QRectF -from qgis.PyQt.QtTest import QSignalSpy -from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsLayout, + QgsLayoutAligner, + QgsLayoutItem, + QgsLayoutItemPicture, + QgsLayoutPoint, + QgsLayoutSize, + QgsProject, + QgsUnitTypes, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslayoutatlas.py b/tests/src/python/test_qgslayoutatlas.py index 781f0a91f2eb..b192e9d7f995 100644 --- a/tests/src/python/test_qgslayoutatlas.py +++ b/tests/src/python/test_qgslayoutatlas.py @@ -9,43 +9,43 @@ __date__ = '19/12/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA -from qgis.PyQt import sip -import tempfile -import shutil -import os import glob +import os +import shutil +import tempfile +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QFileInfo, QRectF +from qgis.PyQt.QtTest import QSignalSpy +from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( - QgsPrintLayout, + QgsCategorizedSymbolRenderer, + QgsCoordinateReferenceSystem, + QgsFeature, + QgsFillSymbol, + QgsFontUtils, + QgsGeometry, + QgsLayoutItemLabel, + QgsLayoutItemLegend, + QgsLayoutItemMap, QgsLayoutObject, + QgsLayoutPoint, + QgsLegendStyle, + QgsMarkerSymbol, + QgsPointXY, + QgsPrintLayout, QgsProject, QgsProperty, - QgsFillSymbol, QgsReadWriteContext, - QgsLayoutItemMap, - QgsLayoutPoint, - QgsVectorLayer, QgsRectangle, - QgsCoordinateReferenceSystem, - QgsSingleSymbolRenderer, - QgsLayoutItemLabel, - QgsFontUtils, - QgsFeature, - QgsGeometry, - QgsPointXY, - QgsCategorizedSymbolRenderer, QgsRendererCategory, - QgsMarkerSymbol, - QgsLayoutItemLegend, - QgsLegendStyle) -from qgis.PyQt.QtCore import QFileInfo, QRectF, QDir -from qgis.PyQt.QtXml import QDomDocument -from utilities import unitTestDataPath + QgsSingleSymbolRenderer, + QgsVectorLayer, +) from qgis.testing import start_app, unittest -from qgis.PyQt.QtTest import QSignalSpy from qgslayoutchecker import QgsLayoutChecker +from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgslayoutatlasclippingsettings.py b/tests/src/python/test_qgslayoutatlasclippingsettings.py index 2665804fc920..41772fb7e39d 100644 --- a/tests/src/python/test_qgslayoutatlasclippingsettings.py +++ b/tests/src/python/test_qgslayoutatlasclippingsettings.py @@ -10,21 +10,20 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - - -from qgis.core import (QgsLayoutItemMap, - QgsLayout, - QgsProject, - QgsLayoutItemMapAtlasClippingSettings, - QgsMapClippingRegion, - QgsVectorLayer, - QgsReadWriteContext) - -from qgis.testing import start_app, unittest -from utilities import unitTestDataPath from qgis.PyQt.QtTest import QSignalSpy from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsLayout, + QgsLayoutItemMap, + QgsLayoutItemMapAtlasClippingSettings, + QgsMapClippingRegion, + QgsProject, + QgsReadWriteContext, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayoutcombobox.py b/tests/src/python/test_qgslayoutcombobox.py index 1d31960116bc..b70d01fff809 100644 --- a/tests/src/python/test_qgslayoutcombobox.py +++ b/tests/src/python/test_qgslayoutcombobox.py @@ -10,18 +10,18 @@ __copyright__ = 'Copyright 2019, The QGIS Project' import qgis # NOQA - - -from qgis.core import (QgsPrintLayout, - QgsLayoutManager, - QgsLayoutManagerProxyModel, - QgsProject, - QgsReport, - ) +from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import ( + QgsLayoutManager, + QgsLayoutManagerProxyModel, + QgsPrintLayout, + QgsProject, + QgsReport, +) from qgis.gui import QgsLayoutComboBox from qgis.testing import start_app, unittest + from utilities import unitTestDataPath -from qgis.PyQt.QtTest import QSignalSpy start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayoutelevationprofile.py b/tests/src/python/test_qgslayoutelevationprofile.py index c2cddfe4b433..785d4360fc64 100644 --- a/tests/src/python/test_qgslayoutelevationprofile.py +++ b/tests/src/python/test_qgslayoutelevationprofile.py @@ -12,28 +12,29 @@ import os import tempfile -from qgis.PyQt.QtCore import QRectF, QDir +from qgis.PyQt.QtCore import QDir, QRectF from qgis.PyQt.QtGui import QColor -from qgis.core import (QgsPrintLayout, - QgsLayoutItemElevationProfile, - QgsLayout, - QgsVectorLayer, - QgsProject, - QgsFontUtils, - QgsLineSymbol, - QgsRasterLayer, - QgsGeometry, - QgsCoordinateReferenceSystem, - QgsExpressionContextUtils, - QgsFlatTerrainProvider, - QgsFeature, - Qgis, - QgsFillSymbol, - QgsLineString, - QgsTextFormat) -from qgis.testing import (start_app, - unittest - ) +from qgis.core import ( + Qgis, + QgsCoordinateReferenceSystem, + QgsExpressionContextUtils, + QgsFeature, + QgsFillSymbol, + QgsFlatTerrainProvider, + QgsFontUtils, + QgsGeometry, + QgsLayout, + QgsLayoutItemElevationProfile, + QgsLineString, + QgsLineSymbol, + QgsPrintLayout, + QgsProject, + QgsRasterLayer, + QgsTextFormat, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest + from qgslayoutchecker import QgsLayoutChecker from test_qgslayoutitem import LayoutItemTestCase from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgslayoutexporter.py b/tests/src/python/test_qgslayoutexporter.py index c42cae7bd97a..07648e145f1b 100644 --- a/tests/src/python/test_qgslayoutexporter.py +++ b/tests/src/python/test_qgslayoutexporter.py @@ -9,48 +9,55 @@ __date__ = '11/12/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA -from qgis.PyQt import sip -import tempfile -import shutil import os import subprocess -from xml.dom import minidom -from osgeo import gdal +import tempfile -from qgis.core import (QgsMultiRenderChecker, - QgsLayoutExporter, - QgsLayout, - QgsProject, - QgsMargins, - QgsLayoutItemShape, - QgsLayoutItemLabel, - QgsLayoutGuide, - QgsRectangle, - QgsLayoutItemPage, - QgsLayoutItemMap, - QgsLayoutItemScaleBar, - QgsLayoutPoint, - QgsLayoutMeasurement, - QgsUnitTypes, - QgsSimpleFillSymbolLayer, - QgsFillSymbol, - QgsVectorLayer, - QgsCoordinateReferenceSystem, - QgsPrintLayout, - QgsSingleSymbolRenderer, - QgsRenderContext, - QgsReport, - QgsPalLayerSettings, - QgsFeature, - QgsGeometry, - QgsPointXY, - QgsVectorLayerSimpleLabeling) -from qgis.PyQt.QtCore import QSize, QSizeF, QDir, QRectF, Qt, QDateTime, QDate, QTime, QTimeZone +import qgis # NOQA +from osgeo import gdal +from qgis.PyQt.QtCore import ( + QDate, + QDateTime, + QDir, + QRectF, + QSize, + Qt, + QTime, + QTimeZone, +) from qgis.PyQt.QtGui import QImage, QPainter from qgis.PyQt.QtPrintSupport import QPrinter -from qgis.PyQt.QtSvg import QSvgRenderer, QSvgGenerator - +from qgis.PyQt.QtSvg import QSvgRenderer +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsFeature, + QgsFillSymbol, + QgsGeometry, + QgsLayout, + QgsLayoutExporter, + QgsLayoutGuide, + QgsLayoutItemLabel, + QgsLayoutItemMap, + QgsLayoutItemPage, + QgsLayoutItemScaleBar, + QgsLayoutItemShape, + QgsLayoutMeasurement, + QgsLayoutPoint, + QgsMargins, + QgsMultiRenderChecker, + QgsPalLayerSettings, + QgsPointXY, + QgsPrintLayout, + QgsProject, + QgsRectangle, + QgsRenderContext, + QgsReport, + QgsSimpleFillSymbolLayer, + QgsSingleSymbolRenderer, + QgsUnitTypes, + QgsVectorLayer, + QgsVectorLayerSimpleLabeling, +) from qgis.testing import start_app, unittest from utilities import getExecutablePath, unitTestDataPath diff --git a/tests/src/python/test_qgslayoutframe.py b/tests/src/python/test_qgslayoutframe.py index c520beb7aca7..3066fc925c94 100644 --- a/tests/src/python/test_qgslayoutframe.py +++ b/tests/src/python/test_qgslayoutframe.py @@ -10,9 +10,8 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.testing import start_app, unittest from qgis.core import QgsLayoutFrame, QgsLayoutItemHtml +from qgis.testing import start_app, unittest from test_qgslayoutitem import LayoutItemTestCase diff --git a/tests/src/python/test_qgslayoutgridsettings.py b/tests/src/python/test_qgslayoutgridsettings.py index 5e328ff8f95b..28ccd89e5405 100644 --- a/tests/src/python/test_qgslayoutgridsettings.py +++ b/tests/src/python/test_qgslayoutgridsettings.py @@ -10,19 +10,17 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsProject, - QgsLayout, - QgsLayoutGridSettings, - QgsLayoutMeasurement, - QgsUnitTypes, - QgsLayoutPoint, - QgsLayoutItemPage, - QgsReadWriteContext) -from qgis.PyQt.QtGui import (QPen, - QColor) +from qgis.PyQt.QtGui import QColor, QPen from qgis.PyQt.QtXml import QDomDocument - +from qgis.core import ( + QgsLayout, + QgsLayoutGridSettings, + QgsLayoutMeasurement, + QgsLayoutPoint, + QgsProject, + QgsReadWriteContext, + QgsUnitTypes, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslayoutguides.py b/tests/src/python/test_qgslayoutguides.py index 923bed77bb82..65f4d30ade5e 100644 --- a/tests/src/python/test_qgslayoutguides.py +++ b/tests/src/python/test_qgslayoutguides.py @@ -10,27 +10,23 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsProject, - QgsLayout, - QgsLayoutGuide, - QgsLayoutMeasurement, - QgsUnitTypes, - QgsReadWriteContext, - QgsLayoutItemPage, - QgsLayoutGuideCollection, - QgsLayoutGuideProxyModel) -from qgis.PyQt.QtCore import (Qt, - QModelIndex) -from qgis.PyQt.QtGui import (QPen, - QColor) +from qgis.PyQt import sip +from qgis.PyQt.QtCore import QModelIndex, Qt from qgis.PyQt.QtTest import QSignalSpy from qgis.PyQt.QtXml import QDomDocument - +from qgis.core import ( + QgsLayout, + QgsLayoutGuide, + QgsLayoutGuideCollection, + QgsLayoutGuideProxyModel, + QgsLayoutItemPage, + QgsLayoutMeasurement, + QgsProject, + QgsReadWriteContext, + QgsUnitTypes, +) from qgis.testing import start_app, unittest -from qgis.PyQt import sip - start_app() diff --git a/tests/src/python/test_qgslayouthtml.py b/tests/src/python/test_qgslayouthtml.py index 1adb5f73ffef..1dccd2b1228f 100644 --- a/tests/src/python/test_qgslayouthtml.py +++ b/tests/src/python/test_qgslayouthtml.py @@ -9,22 +9,21 @@ __date__ = '20/11/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA - import os -from qgis.PyQt.QtCore import QUrl, qDebug, QRectF -from qgis.core import (QgsLayout, - QgsLayoutItemHtml, - QgsLayoutFrame, - QgsLayoutMultiFrame, - QgsMapSettings, - QgsProject) - -from qgslayoutchecker import QgsLayoutChecker - +import qgis # NOQA +from qgis.PyQt.QtCore import QRectF, QUrl, qDebug +from qgis.core import ( + QgsLayout, + QgsLayoutFrame, + QgsLayoutItemHtml, + QgsLayoutMultiFrame, + QgsProject, +) from qgis.testing import start_app, unittest from qgis.testing.mocked import get_iface + +from qgslayoutchecker import QgsLayoutChecker from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgslayoutitem.py b/tests/src/python/test_qgslayoutitem.py index 84fb61af195d..2542e5f9f3fc 100644 --- a/tests/src/python/test_qgslayoutitem.py +++ b/tests/src/python/test_qgslayoutitem.py @@ -9,26 +9,28 @@ __date__ = '17/01/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA - import os -from qgis.testing import start_app, unittest -from qgis.core import (QgsProject, - QgsLayout, - QgsLayoutItemMap, - QgsLayoutItemShape, - QgsLayoutObject, - QgsProperty, - QgsLayoutMeasurement, - QgsUnitTypes, - QgsLayoutPoint, - QgsLayoutSize, - QgsLayoutItemLabel, - QgsLayoutItem, - QgsApplication) + +import qgis # NOQA from qgis.PyQt.QtCore import QRectF from qgis.PyQt.QtGui import QColor, QPainter from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import ( + QgsLayout, + QgsLayoutItem, + QgsLayoutItemLabel, + QgsLayoutItemMap, + QgsLayoutItemShape, + QgsLayoutMeasurement, + QgsLayoutObject, + QgsLayoutPoint, + QgsLayoutSize, + QgsProject, + QgsProperty, + QgsUnitTypes, +) +from qgis.testing import start_app, unittest + from utilities import unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayoutitemcombobox.py b/tests/src/python/test_qgslayoutitemcombobox.py index 466327aff70e..960029d4ba33 100644 --- a/tests/src/python/test_qgslayoutitemcombobox.py +++ b/tests/src/python/test_qgslayoutitemcombobox.py @@ -10,19 +10,20 @@ __copyright__ = 'Copyright 2019, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsProject, - QgsPrintLayout, - QgsLayoutItemMap, - QgsLayoutItemLabel, - QgsLayoutItemRegistry, - QgsLayoutItemShape, - QgsLayoutItem) +from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import ( + QgsLayoutItem, + QgsLayoutItemLabel, + QgsLayoutItemMap, + QgsLayoutItemRegistry, + QgsLayoutItemShape, + QgsPrintLayout, + QgsProject, +) from qgis.gui import QgsLayoutItemComboBox -from qgis.PyQt.QtCore import Qt, QModelIndex from qgis.testing import start_app, unittest + from utilities import unitTestDataPath -from qgis.PyQt.QtTest import QSignalSpy start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayoutitempropertiesdialog.py b/tests/src/python/test_qgslayoutitempropertiesdialog.py index 0767c0b4cf75..544ce6fc4f42 100644 --- a/tests/src/python/test_qgslayoutitempropertiesdialog.py +++ b/tests/src/python/test_qgslayoutitempropertiesdialog.py @@ -11,9 +11,14 @@ import qgis # NOQA -from qgis.core import QgsUnitTypes, QgsLayoutSize, QgsLayoutPoint, QgsLayoutItem, QgsProject, QgsLayout -from qgis.gui import QgsLayoutItemPropertiesDialog - +from qgis.core import ( + QgsLayout, + QgsLayoutItem, + QgsLayoutPoint, + QgsLayoutSize, + QgsProject, + QgsUnitTypes, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslayoutlabel.py b/tests/src/python/test_qgslayoutlabel.py index 52097e70929f..41fc35f4ca9e 100644 --- a/tests/src/python/test_qgslayoutlabel.py +++ b/tests/src/python/test_qgslayoutlabel.py @@ -10,20 +10,20 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.testing import start_app, unittest -from qgis.PyQt.QtCore import QFileInfo, QDate, QDateTime -from qgis.core import (QgsVectorLayer, - QgsPrintLayout, - QgsLayout, - QgsLayoutItemLabel, - QgsProject, - QgsLayoutItemPage, - QgsLayoutPoint) -from utilities import unitTestDataPath +from qgis.PyQt.QtCore import QDate, QDateTime, QFileInfo from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import ( + QgsLayoutItemLabel, + QgsLayoutItemPage, + QgsLayoutPoint, + QgsPrintLayout, + QgsProject, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest from test_qgslayoutitem import LayoutItemTestCase +from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgslayoutlegend.py b/tests/src/python/test_qgslayoutlegend.py index 372bd0100e2f..d5b1a719a714 100644 --- a/tests/src/python/test_qgslayoutlegend.py +++ b/tests/src/python/test_qgslayoutlegend.py @@ -9,43 +9,43 @@ __date__ = '24/10/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -from qgis.PyQt.QtCore import QRectF, QDir +import os +from time import sleep + +from qgis.PyQt.QtCore import QDir, QRectF from qgis.PyQt.QtGui import QColor +from qgis.core import ( + QgsCategorizedSymbolRenderer, + QgsExpression, + QgsFillSymbol, + QgsFontUtils, + QgsLayout, + QgsLayoutItem, + QgsLayoutItemLegend, + QgsLayoutItemMap, + QgsLayoutMeasurement, + QgsLayoutObject, + QgsLayoutPoint, + QgsLayoutSize, + QgsLegendStyle, + QgsLineSymbol, + QgsMapLayerLegendUtils, + QgsMapSettings, + QgsMapThemeCollection, + QgsMarkerSymbol, + QgsPrintLayout, + QgsProject, + QgsProperty, + QgsRectangle, + QgsRendererCategory, + QgsSingleSymbolRenderer, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest -from qgis.core import (QgsPrintLayout, - QgsLayoutItemLegend, - QgsLayoutItemMap, - QgsLayout, - QgsMapSettings, - QgsVectorLayer, - QgsMarkerSymbol, - QgsSingleSymbolRenderer, - QgsRectangle, - QgsProject, - QgsLayoutObject, - QgsProperty, - QgsLayoutMeasurement, - QgsLayoutItem, - QgsLayoutPoint, - QgsLayoutSize, - QgsExpression, - QgsMapLayerLegendUtils, - QgsLegendStyle, - QgsFontUtils, - QgsLineSymbol, - QgsMapThemeCollection, - QgsCategorizedSymbolRenderer, - QgsRendererCategory, - QgsFillSymbol, - QgsApplication) -from qgis.testing import (start_app, - unittest - ) -from utilities import unitTestDataPath from qgslayoutchecker import QgsLayoutChecker -import os -from time import sleep from test_qgslayoutitem import LayoutItemTestCase +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayoutmanager.py b/tests/src/python/test_qgslayoutmanager.py index 3276eb2d989e..c334a72456cf 100644 --- a/tests/src/python/test_qgslayoutmanager.py +++ b/tests/src/python/test_qgslayoutmanager.py @@ -10,17 +10,18 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsPrintLayout, - QgsLayoutManager, - QgsProject, - QgsReport, - QgsMasterLayoutInterface) - +from qgis.PyQt.QtTest import QSignalSpy +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsLayoutManager, + QgsMasterLayoutInterface, + QgsPrintLayout, + QgsProject, + QgsReport, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath -from qgis.PyQt.QtXml import QDomDocument -from qgis.PyQt.QtTest import QSignalSpy start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayoutmanagermodel.py b/tests/src/python/test_qgslayoutmanagermodel.py index 02eaeddeb8c1..2a7c7662fa50 100644 --- a/tests/src/python/test_qgslayoutmanagermodel.py +++ b/tests/src/python/test_qgslayoutmanagermodel.py @@ -10,18 +10,17 @@ __copyright__ = 'Copyright 2019, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtXml import QDomDocument - -from qgis.core import (QgsPrintLayout, - QgsLayoutManager, - QgsLayoutManagerModel, - QgsLayoutManagerProxyModel, - QgsProject, - QgsReport, - ) -from qgis.PyQt.QtCore import Qt, QModelIndex +from qgis.PyQt.QtCore import QModelIndex, Qt +from qgis.core import ( + QgsLayoutManager, + QgsLayoutManagerModel, + QgsLayoutManagerProxyModel, + QgsPrintLayout, + QgsProject, + QgsReport, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgslayoutmap.py b/tests/src/python/test_qgslayoutmap.py index 9b926cd9df87..42d31936a799 100644 --- a/tests/src/python/test_qgslayoutmap.py +++ b/tests/src/python/test_qgslayoutmap.py @@ -9,49 +9,54 @@ __date__ = '20/10/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA - import os -from qgis.PyQt.QtCore import QFileInfo, QRectF, QDir, QCoreApplication, QEvent, QSizeF -from qgis.PyQt.QtXml import QDomDocument -from qgis.PyQt.QtGui import QPainter, QColor +import qgis # NOQA +from qgis.PyQt.QtCore import ( + QDir, + QFileInfo, + QRectF, + QSizeF, +) +from qgis.PyQt.QtGui import QColor, QPainter from qgis.PyQt.QtTest import QSignalSpy - -from qgis.core import (QgsLayoutItemMap, - QgsRectangle, - QgsRasterLayer, - QgsVectorLayer, - QgsLayout, - QgsMapSettings, - QgsProject, - QgsMultiBandColorRenderer, - QgsCoordinateReferenceSystem, - QgsTextFormat, - QgsFontUtils, - QgsPalLayerSettings, - QgsNullSymbolRenderer, - QgsPoint, - QgsFeature, - QgsVectorLayerSimpleLabeling, - QgsLabelingEngineSettings, - QgsLayoutMeasurement, - QgsUnitTypes, - QgsLayoutObject, - QgsProperty, - QgsReadWriteContext, - QgsFillSymbol, - QgsSingleSymbolRenderer, - QgsGeometry, - QgsLayoutItemShape, - QgsMapClippingRegion, - QgsLayoutItemMapOverview, - QgsAnnotationPolygonItem) - +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsAnnotationPolygonItem, + QgsCoordinateReferenceSystem, + QgsFeature, + QgsFillSymbol, + QgsFontUtils, + QgsGeometry, + QgsLabelingEngineSettings, + QgsLayout, + QgsLayoutItemMap, + QgsLayoutItemMapOverview, + QgsLayoutItemShape, + QgsLayoutMeasurement, + QgsLayoutObject, + QgsMapClippingRegion, + QgsMapSettings, + QgsMultiBandColorRenderer, + QgsNullSymbolRenderer, + QgsPalLayerSettings, + QgsPoint, + QgsProject, + QgsProperty, + QgsRasterLayer, + QgsReadWriteContext, + QgsRectangle, + QgsSingleSymbolRenderer, + QgsTextFormat, + QgsUnitTypes, + QgsVectorLayer, + QgsVectorLayerSimpleLabeling, +) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath + from qgslayoutchecker import QgsLayoutChecker from test_qgslayoutitem import LayoutItemTestCase +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayoutmapgrid.py b/tests/src/python/test_qgslayoutmapgrid.py index f7f475ba3e71..a398f702a22a 100644 --- a/tests/src/python/test_qgslayoutmapgrid.py +++ b/tests/src/python/test_qgslayoutmapgrid.py @@ -10,24 +10,24 @@ __copyright__ = 'Copyright 2012, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtCore import QRectF, QDir -from qgis.PyQt.QtGui import QPainter, QColor +from qgis.PyQt.QtCore import QDir, QRectF +from qgis.PyQt.QtGui import QColor, QPainter from qgis.PyQt.QtTest import QSignalSpy - -from qgis.core import (QgsLayoutItemMap, - QgsLayoutItemMapGrid, - QgsRectangle, - QgsLayout, - QgsProperty, - QgsLayoutObject, - QgsFontUtils, - QgsTextFormat, - QgsProject, - QgsCoordinateReferenceSystem) +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsLayout, + QgsLayoutItemMap, + QgsLayoutItemMapGrid, + QgsLayoutObject, + QgsProject, + QgsProperty, + QgsRectangle, + QgsTextFormat, +) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath, getTestFont + from qgslayoutchecker import QgsLayoutChecker +from utilities import getTestFont, unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayoutmapitemclippingsettings.py b/tests/src/python/test_qgslayoutmapitemclippingsettings.py index 3ffaffe18d50..df706ea6d1b4 100644 --- a/tests/src/python/test_qgslayoutmapitemclippingsettings.py +++ b/tests/src/python/test_qgslayoutmapitemclippingsettings.py @@ -10,27 +10,23 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - - -from qgis.core import (QgsLayoutItemMap, - QgsLayout, - QgsProject, - QgsPrintLayout, - QgsLayoutItemMapItemClipPathSettings, - QgsMapClippingRegion, - QgsLayoutItemShape, - QgsReadWriteContext, - QgsRectangle) -from qgis.PyQt.QtCore import ( - QCoreApplication, - QEvent, - QRectF -) -from qgis.testing import start_app, unittest -from utilities import unitTestDataPath +from qgis.PyQt.QtCore import QCoreApplication, QEvent, QRectF from qgis.PyQt.QtTest import QSignalSpy from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsLayout, + QgsLayoutItemMap, + QgsLayoutItemMapItemClipPathSettings, + QgsLayoutItemShape, + QgsMapClippingRegion, + QgsPrintLayout, + QgsProject, + QgsReadWriteContext, + QgsRectangle, +) +from qgis.testing import start_app, unittest +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayoutmapoverview.py b/tests/src/python/test_qgslayoutmapoverview.py index 3e55bfd4e39c..7057a97ce5e0 100644 --- a/tests/src/python/test_qgslayoutmapoverview.py +++ b/tests/src/python/test_qgslayoutmapoverview.py @@ -9,35 +9,35 @@ __date__ = '20/10/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA - import os -from qgis.PyQt.QtCore import QFileInfo, QRectF, QDir +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QFileInfo, QRectF from qgis.PyQt.QtGui import QPainter - -from qgis.core import (QgsLayoutItemMap, - QgsLayoutItemMapItem, - QgsRectangle, - QgsRasterLayer, - QgsVectorLayer, - QgsLayout, - QgsProject, - QgsMultiBandColorRenderer, - QgsFillSymbol, - QgsSingleSymbolRenderer, - QgsCoordinateReferenceSystem, - QgsLayoutItemMapOverview, - QgsFeature, - QgsSymbolLayer, - QgsProperty, - QgsGeometry, - QgsPointXY) - +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsFeature, + QgsFillSymbol, + QgsGeometry, + QgsLayout, + QgsLayoutItemMap, + QgsLayoutItemMapItem, + QgsLayoutItemMapOverview, + QgsMultiBandColorRenderer, + QgsPointXY, + QgsProject, + QgsProperty, + QgsRasterLayer, + QgsRectangle, + QgsSingleSymbolRenderer, + QgsSymbolLayer, + QgsVectorLayer, +) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath + from qgslayoutchecker import QgsLayoutChecker from test_qgslayoutitem import LayoutItemTestCase +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayoutmarker.py b/tests/src/python/test_qgslayoutmarker.py index 4d3927305c7f..9c935a566712 100644 --- a/tests/src/python/test_qgslayoutmarker.py +++ b/tests/src/python/test_qgslayoutmarker.py @@ -10,28 +10,27 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtCore import Qt, QRectF +from qgis.PyQt.QtCore import QRectF, Qt from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsLayout, + QgsLayoutItemMap, + QgsLayoutItemMarker, + QgsLayoutItemRegistry, + QgsLayoutNorthArrowHandler, + QgsLayoutPoint, + QgsMarkerSymbol, + QgsProject, + QgsReadWriteContext, + QgsRectangle, + QgsUnitTypes, +) +from qgis.testing import start_app, unittest -from qgis.core import (QgsLayoutItemMarker, - QgsLayoutItemRegistry, - QgsLayout, - QgsMarkerSymbol, - QgsProject, - QgsReadWriteContext, - QgsLayoutPoint, - QgsUnitTypes, - QgsLayoutItemMap, - QgsRectangle, - QgsLayoutNorthArrowHandler, - QgsCoordinateReferenceSystem) -from qgis.testing import (start_app, - unittest - ) -from utilities import unitTestDataPath from qgslayoutchecker import QgsLayoutChecker from test_qgslayoutitem import LayoutItemTestCase +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayoutnortharrowhandler.py b/tests/src/python/test_qgslayoutnortharrowhandler.py index 5e721c60e690..47c8cbbf9f82 100644 --- a/tests/src/python/test_qgslayoutnortharrowhandler.py +++ b/tests/src/python/test_qgslayoutnortharrowhandler.py @@ -10,19 +10,19 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - from qgis.PyQt.QtCore import QRectF from qgis.PyQt.QtTest import QSignalSpy -from qgis.core import (QgsLayoutNorthArrowHandler, - QgsLayout, - QgsLayoutItemMap, - QgsRectangle, - QgsCoordinateReferenceSystem, - QgsProject - ) +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsLayout, + QgsLayoutItemMap, + QgsLayoutNorthArrowHandler, + QgsProject, + QgsRectangle, +) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayoutpage.py b/tests/src/python/test_qgslayoutpage.py index f95556344660..9a008c29832c 100644 --- a/tests/src/python/test_qgslayoutpage.py +++ b/tests/src/python/test_qgslayoutpage.py @@ -10,18 +10,19 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.testing import start_app, unittest from qgis.PyQt.QtCore import Qt -from qgis.core import (QgsProject, - QgsLayout, - QgsLayoutItemPage, - QgsSimpleFillSymbolLayer, - QgsFillSymbol, - QgsReadWriteContext) +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsFillSymbol, + QgsLayout, + QgsLayoutItemPage, + QgsProject, + QgsReadWriteContext, + QgsSimpleFillSymbolLayer, +) +from qgis.testing import start_app, unittest from test_qgslayoutitem import LayoutItemTestCase -from qgis.PyQt.QtXml import QDomDocument start_app() diff --git a/tests/src/python/test_qgslayoutpagecollection.py b/tests/src/python/test_qgslayoutpagecollection.py index b96d96a959e9..52f331a0dc30 100644 --- a/tests/src/python/test_qgslayoutpagecollection.py +++ b/tests/src/python/test_qgslayoutpagecollection.py @@ -11,27 +11,26 @@ import qgis # NOQA from qgis.PyQt import sip - -from qgis.core import (QgsUnitTypes, - QgsLayout, - QgsLayoutItemPage, - QgsLayoutSize, - QgsLayoutPoint, - QgsLayoutObject, - QgsProject, - QgsMargins, - QgsProperty, - QgsLayoutGuide, - QgsLayoutMeasurement, - QgsLayoutPageCollection, - QgsSimpleFillSymbolLayer, - QgsLayoutItemShape, - QgsFillSymbol, - QgsReadWriteContext) -from qgis.PyQt.QtCore import Qt, QCoreApplication, QEvent, QPointF, QRectF +from qgis.PyQt.QtCore import QCoreApplication, QEvent, QPointF, QRectF, Qt from qgis.PyQt.QtTest import QSignalSpy from qgis.PyQt.QtXml import QDomDocument - +from qgis.core import ( + QgsFillSymbol, + QgsLayout, + QgsLayoutGuide, + QgsLayoutItemPage, + QgsLayoutItemShape, + QgsLayoutMeasurement, + QgsLayoutObject, + QgsLayoutPoint, + QgsLayoutSize, + QgsMargins, + QgsProject, + QgsProperty, + QgsReadWriteContext, + QgsSimpleFillSymbolLayer, + QgsUnitTypes, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslayoutpicture.py b/tests/src/python/test_qgslayoutpicture.py index 67f7224af8ad..08563bb29fcf 100644 --- a/tests/src/python/test_qgslayoutpicture.py +++ b/tests/src/python/test_qgslayoutpicture.py @@ -9,27 +9,29 @@ __date__ = '23/10/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA - +import http.server import os import socketserver import threading -import http.server -from qgis.PyQt.QtCore import QRectF, QDir + +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QRectF from qgis.PyQt.QtTest import QSignalSpy from qgis.PyQt.QtXml import QDomDocument -from qgis.core import (QgsLayoutItemPicture, - QgsLayout, - QgsLayoutItemMap, - QgsRectangle, - QgsCoordinateReferenceSystem, - QgsProject, - QgsReadWriteContext - ) +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsLayout, + QgsLayoutItemMap, + QgsLayoutItemPicture, + QgsProject, + QgsReadWriteContext, + QgsRectangle, +) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath + from qgslayoutchecker import QgsLayoutChecker from test_qgslayoutitem import LayoutItemTestCase +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayoutpolygon.py b/tests/src/python/test_qgslayoutpolygon.py index 730e307b2818..1246b525ca50 100644 --- a/tests/src/python/test_qgslayoutpolygon.py +++ b/tests/src/python/test_qgslayoutpolygon.py @@ -10,27 +10,26 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtGui import QPolygonF, QPainter, QImage from qgis.PyQt.QtCore import QPointF, QRectF -from qgis.PyQt.QtXml import QDomDocument +from qgis.PyQt.QtGui import QImage, QPainter, QPolygonF from qgis.PyQt.QtTest import QSignalSpy +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsFillSymbol, + QgsLayout, + QgsLayoutItem, + QgsLayoutItemPolygon, + QgsLayoutItemRegistry, + QgsLayoutItemRenderContext, + QgsLayoutUtils, + QgsProject, + QgsReadWriteContext, +) +from qgis.testing import start_app, unittest -from qgis.core import (QgsLayoutItemPolygon, - QgsLayoutItemRegistry, - QgsLayout, - QgsFillSymbol, - QgsProject, - QgsReadWriteContext, - QgsLayoutItem, - QgsLayoutItemRenderContext, - QgsLayoutUtils) -from qgis.testing import (start_app, - unittest - ) -from utilities import unitTestDataPath from qgslayoutchecker import QgsLayoutChecker from test_qgslayoutitem import LayoutItemTestCase +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayoutpolyline.py b/tests/src/python/test_qgslayoutpolyline.py index e2f3a066e486..38f23fd06279 100644 --- a/tests/src/python/test_qgslayoutpolyline.py +++ b/tests/src/python/test_qgslayoutpolyline.py @@ -10,23 +10,22 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtGui import QPolygonF from qgis.PyQt.QtCore import QPointF +from qgis.PyQt.QtGui import QPolygonF from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsLayout, + QgsLayoutItemPolyline, + QgsLayoutItemRegistry, + QgsLineSymbol, + QgsProject, + QgsReadWriteContext, +) +from qgis.testing import start_app, unittest -from qgis.core import (QgsLayoutItemPolyline, - QgsLayoutItemRegistry, - QgsLayout, - QgsLineSymbol, - QgsProject, - QgsReadWriteContext) -from qgis.testing import (start_app, - unittest - ) -from utilities import unitTestDataPath from qgslayoutchecker import QgsLayoutChecker from test_qgslayoutitem import LayoutItemTestCase +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslayoutscalebar.py b/tests/src/python/test_qgslayoutscalebar.py index 64c0ff584e61..101edb1e5b55 100644 --- a/tests/src/python/test_qgslayoutscalebar.py +++ b/tests/src/python/test_qgslayoutscalebar.py @@ -10,9 +10,8 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.testing import start_app, unittest from qgis.core import QgsLayoutItemScaleBar +from qgis.testing import start_app, unittest from test_qgslayoutitem import LayoutItemTestCase diff --git a/tests/src/python/test_qgslayoutshape.py b/tests/src/python/test_qgslayoutshape.py index 9e340b899cb6..417094766a07 100644 --- a/tests/src/python/test_qgslayoutshape.py +++ b/tests/src/python/test_qgslayoutshape.py @@ -10,21 +10,20 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.testing import start_app, unittest +from qgis.PyQt.QtCore import QRectF +from qgis.PyQt.QtTest import QSignalSpy +from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( - QgsLayoutItemShape, - QgsProject, + QgsFillSymbol, QgsLayout, QgsLayoutItem, + QgsLayoutItemShape, QgsLayoutMeasurement, + QgsProject, + QgsReadWriteContext, QgsUnitTypes, - QgsFillSymbol, - QgsReadWriteContext ) -from qgis.PyQt.QtCore import QRectF -from qgis.PyQt.QtXml import QDomDocument, QDomElement -from qgis.PyQt.QtTest import QSignalSpy +from qgis.testing import start_app, unittest from test_qgslayoutitem import LayoutItemTestCase diff --git a/tests/src/python/test_qgslayoutsnapper.py b/tests/src/python/test_qgslayoutsnapper.py index 2a1822620fd3..1c25ddde5eb5 100644 --- a/tests/src/python/test_qgslayoutsnapper.py +++ b/tests/src/python/test_qgslayoutsnapper.py @@ -10,23 +10,22 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsProject, - QgsLayout, - QgsLayoutSnapper, - QgsLayoutGridSettings, - QgsLayoutMeasurement, - QgsUnitTypes, - QgsLayoutPoint, - QgsLayoutItemPage, - QgsLayoutGuide, - QgsReadWriteContext, - QgsLayoutItemMap, - QgsLayoutSize) -from qgis.PyQt.QtCore import QPointF, Qt, QRectF +from qgis.PyQt.QtCore import QPointF, QRectF, Qt from qgis.PyQt.QtWidgets import QGraphicsLineItem from qgis.PyQt.QtXml import QDomDocument - +from qgis.core import ( + QgsLayout, + QgsLayoutGuide, + QgsLayoutItemMap, + QgsLayoutItemPage, + QgsLayoutMeasurement, + QgsLayoutPoint, + QgsLayoutSize, + QgsLayoutSnapper, + QgsProject, + QgsReadWriteContext, + QgsUnitTypes, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslayouttable.py b/tests/src/python/test_qgslayouttable.py index d345d8a87276..01492fea4ff9 100644 --- a/tests/src/python/test_qgslayouttable.py +++ b/tests/src/python/test_qgslayouttable.py @@ -9,10 +9,8 @@ __date__ = '13/06/2022' __copyright__ = 'Copyright 2022, The QGIS Project' -from qgis.core import (QgsLayoutTableColumn) -from qgis.testing import (start_app, - unittest - ) +from qgis.core import QgsLayoutTableColumn +from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgslayoutunitscombobox.py b/tests/src/python/test_qgslayoutunitscombobox.py index 4653f9a5eeec..9d59c738352c 100644 --- a/tests/src/python/test_qgslayoutunitscombobox.py +++ b/tests/src/python/test_qgslayoutunitscombobox.py @@ -10,13 +10,9 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.core import QgsUnitTypes, QgsLayoutMeasurementConverter -from qgis.gui import QgsLayoutUnitsComboBox - -from qgis.PyQt.QtWidgets import QDoubleSpinBox - from qgis.PyQt.QtTest import QSignalSpy +from qgis.PyQt.QtWidgets import QDoubleSpinBox +from qgis.core import QgsLayoutMeasurementConverter, QgsUnitTypes from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslayoutview.py b/tests/src/python/test_qgslayoutview.py index e666630c7544..b50c9acbef16 100644 --- a/tests/src/python/test_qgslayoutview.py +++ b/tests/src/python/test_qgslayoutview.py @@ -11,23 +11,24 @@ import qgis # NOQA from qgis.PyQt import sip -from qgis.core import (QgsProject, - QgsLayout, - QgsUnitTypes, - QgsLayoutItemPicture, - QgsLayoutItemLabel, - QgsLayoutItemHtml, - QgsLayoutItemRegistry, - QgsLayoutFrame, - QgsLayoutPoint, - QgsLayoutSize, - QgsLayoutAligner) -from qgis.gui import QgsLayoutView -from qgis.PyQt.QtCore import QRectF, QMimeData, QByteArray +from qgis.PyQt.QtCore import QByteArray, QMimeData, QRectF from qgis.PyQt.QtGui import QTransform -from qgis.PyQt.QtWidgets import QApplication from qgis.PyQt.QtTest import QSignalSpy - +from qgis.PyQt.QtWidgets import QApplication +from qgis.core import ( + QgsLayout, + QgsLayoutAligner, + QgsLayoutFrame, + QgsLayoutItemHtml, + QgsLayoutItemLabel, + QgsLayoutItemPicture, + QgsLayoutItemRegistry, + QgsLayoutPoint, + QgsLayoutSize, + QgsProject, + QgsUnitTypes, +) +from qgis.gui import QgsLayoutView from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslegendpatchshape.py b/tests/src/python/test_qgslegendpatchshape.py index 903d2d7456bc..b7e82c9fe186 100644 --- a/tests/src/python/test_qgslegendpatchshape.py +++ b/tests/src/python/test_qgslegendpatchshape.py @@ -10,31 +10,24 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtCore import (QSize, - QSizeF, - QPointF, - QDir) -from qgis.PyQt.QtGui import (QPolygonF, - QImage, - QPainter, - QColor) -from qgis.core import (QgsLegendPatchShape, - QgsGeometry, - QgsSymbol, - QgsFillSymbol, - QgsLineSymbol, - QgsMarkerSymbol, - QgsRenderChecker, - QgsReadWriteContext, - QgsRenderContext, - QgsStyle - ) -from qgis.PyQt.QtXml import QDomDocument, QDomElement - +from qgis.PyQt.QtCore import QDir, QSize, QSizeF +from qgis.PyQt.QtGui import QColor, QImage, QPainter +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsFillSymbol, + QgsGeometry, + QgsLegendPatchShape, + QgsLineSymbol, + QgsMarkerSymbol, + QgsReadWriteContext, + QgsRenderChecker, + QgsRenderContext, + QgsStyle, + QgsSymbol, +) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslegendpatchshapebutton.py b/tests/src/python/test_qgslegendpatchshapebutton.py index c7ce71844d2b..770d5bb11ec4 100644 --- a/tests/src/python/test_qgslegendpatchshapebutton.py +++ b/tests/src/python/test_qgslegendpatchshapebutton.py @@ -10,17 +10,12 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsLegendPatchShape, - QgsGeometry, - QgsSymbol - ) -from qgis.gui import QgsLegendPatchShapeButton from qgis.PyQt.QtTest import QSignalSpy - +from qgis.core import QgsGeometry, QgsLegendPatchShape, QgsSymbol +from qgis.gui import QgsLegendPatchShapeButton from qgis.testing import start_app, unittest -from utilities import unitTestDataPath +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslegendpatchshapewidget.py b/tests/src/python/test_qgslegendpatchshapewidget.py index b4f14654077c..b876a8d6787e 100644 --- a/tests/src/python/test_qgslegendpatchshapewidget.py +++ b/tests/src/python/test_qgslegendpatchshapewidget.py @@ -10,17 +10,12 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsLegendPatchShape, - QgsGeometry, - QgsSymbol - ) -from qgis.gui import QgsLegendPatchShapeWidget from qgis.PyQt.QtTest import QSignalSpy - +from qgis.core import QgsGeometry, QgsLegendPatchShape, QgsSymbol +from qgis.gui import QgsLegendPatchShapeWidget from qgis.testing import start_app, unittest -from utilities import unitTestDataPath +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslegendrenderer.py b/tests/src/python/test_qgslegendrenderer.py index 7c89b26d2601..04d5697aaaa9 100644 --- a/tests/src/python/test_qgslegendrenderer.py +++ b/tests/src/python/test_qgslegendrenderer.py @@ -16,13 +16,14 @@ import os from qgis.core import ( - QgsProject, QgsLegendModel, - QgsLegendSettings, QgsLegendRenderer, + QgsLegendSettings, + QgsProject, QgsRenderContext, ) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath QGISAPP = start_app() diff --git a/tests/src/python/test_qgslineburstsymbollayer.py b/tests/src/python/test_qgslineburstsymbollayer.py index c76666d5b79e..5a77e455a9d9 100644 --- a/tests/src/python/test_qgslineburstsymbollayer.py +++ b/tests/src/python/test_qgslineburstsymbollayer.py @@ -21,21 +21,22 @@ import qgis # NOQA from qgis.PyQt.QtCore import QDir, Qt -from qgis.PyQt.QtGui import QImage, QColor, QPainter -from qgis.core import (QgsGeometry, - Qgis, - QgsRenderContext, - QgsFeature, - QgsMapSettings, - QgsRenderChecker, - QgsGradientColorRamp, - QgsGradientStop, - QgsLineSymbol, - QgsLineburstSymbolLayer, - QgsSymbolLayer, - QgsProperty - ) -from qgis.testing import unittest, start_app +from qgis.PyQt.QtGui import QColor, QImage, QPainter +from qgis.core import ( + Qgis, + QgsFeature, + QgsGeometry, + QgsGradientColorRamp, + QgsGradientStop, + QgsLineburstSymbolLayer, + QgsLineSymbol, + QgsMapSettings, + QgsProperty, + QgsRenderChecker, + QgsRenderContext, + QgsSymbolLayer, +) +from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgslinesegment.py b/tests/src/python/test_qgslinesegment.py index df6c43516756..e317c4edf8f7 100644 --- a/tests/src/python/test_qgslinesegment.py +++ b/tests/src/python/test_qgslinesegment.py @@ -11,8 +11,7 @@ import qgis # NOQA -from qgis.core import (QgsPointXY, QgsLineSegment2D) - +from qgis.core import QgsLineSegment2D, QgsPointXY from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslinesymbollayers.py b/tests/src/python/test_qgslinesymbollayers.py index 77900aabd750..ae34c16e7b96 100644 --- a/tests/src/python/test_qgslinesymbollayers.py +++ b/tests/src/python/test_qgslinesymbollayers.py @@ -11,19 +11,18 @@ import qgis # NOQA - -from qgis.testing import unittest from qgis.PyQt.QtCore import QDir -from qgis.PyQt.QtGui import (QImage, - QPainter, - QColor) -from qgis.core import (QgsRenderChecker, - QgsSimpleLineSymbolLayer, - QgsMapSettings, - QgsLineSymbol, - QgsGeometry, - QgsFeature, - QgsRenderContext) +from qgis.PyQt.QtGui import QColor, QImage, QPainter +from qgis.core import ( + QgsFeature, + QgsGeometry, + QgsLineSymbol, + QgsMapSettings, + QgsRenderChecker, + QgsRenderContext, + QgsSimpleLineSymbolLayer, +) +from qgis.testing import unittest class TestQgsLineSymbolLayers(unittest.TestCase): diff --git a/tests/src/python/test_qgslocaldefaultsettings.py b/tests/src/python/test_qgslocaldefaultsettings.py index e5158aef8697..c93ada253634 100644 --- a/tests/src/python/test_qgslocaldefaultsettings.py +++ b/tests/src/python/test_qgslocaldefaultsettings.py @@ -10,16 +10,16 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsSettings, - QgsLocalDefaultSettings, - QgsBearingNumericFormat, - QgsGeographicCoordinateNumericFormat) - from qgis.PyQt.QtCore import QCoreApplication - +from qgis.core import ( + QgsBearingNumericFormat, + QgsGeographicCoordinateNumericFormat, + QgsLocalDefaultSettings, + QgsSettings, +) from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath) + +from utilities import unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgslocalizeddatapathregistry.py b/tests/src/python/test_qgslocalizeddatapathregistry.py index 62966aa6af23..9abe62028563 100644 --- a/tests/src/python/test_qgslocalizeddatapathregistry.py +++ b/tests/src/python/test_qgslocalizeddatapathregistry.py @@ -9,20 +9,20 @@ __date__ = '13/05/2020' __copyright__ = 'Copyright 2019, The QGIS Project' -import qgis # NOQA - -from tempfile import NamedTemporaryFile -import tempfile -from pathlib import Path import os import shutil +import tempfile +from pathlib import Path +from tempfile import NamedTemporaryFile + +import qgis # NOQA +from qgis.PyQt.QtCore import QDir from qgis.core import ( QgsApplication, QgsPathResolver, QgsProject, - QgsVectorLayer + QgsVectorLayer, ) -from qgis.PyQt.QtCore import QDir from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslocator.py b/tests/src/python/test_qgslocator.py index 704158ce6e71..ad1e5347c9e8 100644 --- a/tests/src/python/test_qgslocator.py +++ b/tests/src/python/test_qgslocator.py @@ -9,22 +9,22 @@ __date__ = '6/05/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA - -import os - -from qgis.core import (QgsLocator, - QgsLocatorFilter, - QgsLocatorContext, - QgsLocatorResult, - QgsLocatorModel, - QgsLocatorProxyModel, - QgsLocatorAutomaticModel, - QgsSettings) -from qgis.PyQt.QtCore import QVariant, pyqtSignal, QCoreApplication from time import sleep -from qgis.testing import start_app, unittest + +import qgis # NOQA from qgis.PyQt import sip +from qgis.PyQt.QtCore import QCoreApplication +from qgis.core import ( + QgsLocator, + QgsLocatorAutomaticModel, + QgsLocatorContext, + QgsLocatorFilter, + QgsLocatorModel, + QgsLocatorProxyModel, + QgsLocatorResult, + QgsSettings, +) +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgslogger.py b/tests/src/python/test_qgslogger.py index 806295bbfd0b..c113d3bdea58 100644 --- a/tests/src/python/test_qgslogger.py +++ b/tests/src/python/test_qgslogger.py @@ -9,10 +9,10 @@ __date__ = '20/08/2012' __copyright__ = 'Copyright 2012, The QGIS Project' -import qgis # NOQA - -import tempfile import os +import tempfile + +import qgis # NOQA (myFileHandle, myFilename) = tempfile.mkstemp() os.environ['QGIS_DEBUG'] = '2' diff --git a/tests/src/python/test_qgsmapboxglconverter.py b/tests/src/python/test_qgsmapboxglconverter.py index 7d7c3182a753..4272d92ab9ed 100644 --- a/tests/src/python/test_qgsmapboxglconverter.py +++ b/tests/src/python/test_qgsmapboxglconverter.py @@ -10,24 +10,24 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA -from qgis.PyQt.QtCore import QSize, QCoreApplication -from qgis.PyQt.QtGui import (QColor, QImage) -from qgis.core import (QgsMapBoxGlStyleConverter, - QgsMapBoxGlStyleConversionContext, - QgsMapBoxGlStyleRasterSource, - QgsSymbolLayer, - QgsWkbTypes, - QgsApplication, - QgsFontManager, - QgsSettings, - Qgis, - QgsRasterLayer, - QgsRasterPipe, - QgsSymbol - ) +from qgis.PyQt.QtCore import QCoreApplication, QSize +from qgis.PyQt.QtGui import QColor, QImage +from qgis.core import ( + Qgis, + QgsApplication, + QgsMapBoxGlStyleConversionContext, + QgsMapBoxGlStyleConverter, + QgsMapBoxGlStyleRasterSource, + QgsRasterLayer, + QgsRasterPipe, + QgsSettings, + QgsSymbol, + QgsSymbolLayer, + QgsWkbTypes, +) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath, getTestFont +from utilities import getTestFont, unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsmapcanvas.py b/tests/src/python/test_qgsmapcanvas.py index cb046db1d757..eee3698648ed 100644 --- a/tests/src/python/test_qgsmapcanvas.py +++ b/tests/src/python/test_qgsmapcanvas.py @@ -9,43 +9,36 @@ __date__ = '24/1/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA +import time -from qgis.PyQt.QtCore import ( - QDate, - QTime, - QDateTime, - QDir +import qgis # NOQA +from qgis.PyQt.QtCore import QDate, QDateTime, QDir, QTime +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsAnnotationLayer, + QgsAnnotationLineItem, + QgsAnnotationMarkerItem, + QgsAnnotationPolygonItem, + QgsCoordinateReferenceSystem, + QgsDateTimeRange, + QgsFeature, + QgsFillSymbol, + QgsGeometry, + QgsInterval, + QgsLineString, + QgsMapThemeCollection, + QgsMultiRenderChecker, + QgsPoint, + QgsPointXY, + QgsPolygon, + QgsProject, + QgsRectangle, + QgsSingleSymbolRenderer, + QgsTemporalController, + QgsTemporalNavigationObject, + QgsVectorLayer, ) - -from qgis.core import (QgsMapSettings, - QgsCoordinateReferenceSystem, - QgsRectangle, - QgsVectorLayer, - QgsFeature, - QgsGeometry, - QgsMultiRenderChecker, - QgsFillSymbol, - QgsSingleSymbolRenderer, - QgsMapThemeCollection, - QgsProject, QgsAnnotationPolygonItem, - QgsPolygon, - QgsLineString, - QgsPoint, - QgsPointXY, - QgsApplication, - QgsAnnotationLayer, - QgsAnnotationLineItem, - QgsAnnotationMarkerItem, - QgsTemporalController, - QgsTemporalNavigationObject, - QgsDateTimeRange, - QgsInterval - ) -from qgis.gui import (QgsMapCanvas) - -from qgis.PyQt.QtXml import (QDomDocument, QDomElement) -import time +from qgis.gui import QgsMapCanvas from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgsmapcanvasannotationitem.py b/tests/src/python/test_qgsmapcanvasannotationitem.py index f17044204415..85b7343b0c6b 100644 --- a/tests/src/python/test_qgsmapcanvasannotationitem.py +++ b/tests/src/python/test_qgsmapcanvasannotationitem.py @@ -10,20 +10,20 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsTextAnnotation, - QgsCoordinateReferenceSystem, - QgsRectangle, - QgsPointXY, - QgsVectorLayer, - QgsFeature, - QgsGeometry, - QgsFillSymbol) -from qgis.gui import QgsMapCanvas, QgsMapCanvasAnnotationItem - from qgis.PyQt.QtCore import QPointF, QSizeF - +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsFeature, + QgsFillSymbol, + QgsGeometry, + QgsPointXY, + QgsRectangle, + QgsTextAnnotation, + QgsVectorLayer, +) +from qgis.gui import QgsMapCanvas, QgsMapCanvasAnnotationItem from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsmapclippingregion.py b/tests/src/python/test_qgsmapclippingregion.py index d61b25d6cb05..7b6cba5ae9be 100644 --- a/tests/src/python/test_qgsmapclippingregion.py +++ b/tests/src/python/test_qgsmapclippingregion.py @@ -11,12 +11,8 @@ import qgis # NOQA +from qgis.core import QgsGeometry, QgsMapClippingRegion, QgsVectorLayer from qgis.testing import unittest -from qgis.core import ( - QgsMapClippingRegion, - QgsGeometry, - QgsVectorLayer -) class TestQgsMapClippingRegion(unittest.TestCase): diff --git a/tests/src/python/test_qgsmapclippingutils.py b/tests/src/python/test_qgsmapclippingutils.py index 09b644f5712c..110773ebd3c5 100644 --- a/tests/src/python/test_qgsmapclippingutils.py +++ b/tests/src/python/test_qgsmapclippingutils.py @@ -11,22 +11,20 @@ import qgis # NOQA -from qgis.testing import unittest from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsCoordinateTransform, + QgsGeometry, QgsMapClippingRegion, QgsMapClippingUtils, + QgsMapLayerType, QgsMapSettings, + QgsMapToPixel, + QgsProject, QgsRenderContext, - QgsGeometry, QgsVectorLayer, - QgsCoordinateTransform, - QgsCoordinateReferenceSystem, - QgsProject, - QgsMapToPixel, - QgsMapLayerType ) - -from qgis.testing import start_app +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsmaplayer.py b/tests/src/python/test_qgsmaplayer.py index 7b81075fb40f..17cc1d04a579 100644 --- a/tests/src/python/test_qgsmaplayer.py +++ b/tests/src/python/test_qgsmaplayer.py @@ -9,22 +9,25 @@ __date__ = '1/02/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import os -import qgis # NOQA -import tempfile import glob +import os import shutil -import sip +import tempfile -from qgis.core import (QgsReadWriteContext, - QgsVectorLayer, - QgsRasterLayer, - QgsProject, - QgsLayerMetadata, - QgsLayerNotesUtils) -from qgis.testing import start_app, unittest -from qgis.PyQt.QtXml import QDomDocument +import qgis # NOQA +import sip from qgis.PyQt.QtCore import QTemporaryDir +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsLayerMetadata, + QgsLayerNotesUtils, + QgsProject, + QgsRasterLayer, + QgsReadWriteContext, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest + from utilities import unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsmaplayeraction.py b/tests/src/python/test_qgsmaplayeraction.py index dc3988037b9a..01c16844f9c9 100644 --- a/tests/src/python/test_qgsmaplayeraction.py +++ b/tests/src/python/test_qgsmaplayeraction.py @@ -9,18 +9,14 @@ __date__ = '24/02/2018' __copyright__ = 'Copyright 2018, The QGIS Project' -import qgis # NOQA switch sip api - -from qgis.core import (QgsVectorLayer, - QgsRasterLayer, - QgsMapLayer) -from qgis.gui import (QgsMapLayerActionRegistry, - QgsMapLayerAction) +import os +import qgis # NOQA switch sip api +from qgis.core import QgsMapLayer, QgsRasterLayer, QgsVectorLayer +from qgis.gui import QgsMapLayerAction from qgis.testing import start_app, unittest -from utilities import unitTestDataPath -import os +from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsmaplayercombobox.py b/tests/src/python/test_qgsmaplayercombobox.py index 087eb809c5f0..d8a2df94e088 100644 --- a/tests/src/python/test_qgsmaplayercombobox.py +++ b/tests/src/python/test_qgsmaplayercombobox.py @@ -10,15 +10,15 @@ __copyright__ = 'Copyright 2019, The QGIS Project' import qgis # NOQA - -from qgis.core import QgsVectorLayer, QgsMeshLayer, QgsProject, QgsMapLayerProxyModel -from qgis.gui import QgsMapLayerComboBox -from qgis.PyQt.QtCore import ( - QCoreApplication, - QEvent -) +from qgis.PyQt.QtCore import QCoreApplication, QEvent from qgis.PyQt.QtTest import QSignalSpy - +from qgis.core import ( + QgsMapLayerProxyModel, + QgsMeshLayer, + QgsProject, + QgsVectorLayer, +) +from qgis.gui import QgsMapLayerComboBox from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsmaplayerfactory.py b/tests/src/python/test_qgsmaplayerfactory.py index 228458d124fc..fefee69a57b0 100644 --- a/tests/src/python/test_qgsmaplayerfactory.py +++ b/tests/src/python/test_qgsmaplayerfactory.py @@ -9,23 +9,23 @@ __date__ = '10/03/2021' __copyright__ = 'Copyright 2021, The QGIS Project' -import qgis # NOQA - import os +import qgis # NOQA from qgis.core import ( + QgsAnnotationLayer, + QgsCoordinateTransformContext, + QgsDataSourceUri, QgsMapLayerFactory, QgsMapLayerType, - QgsVectorLayer, - QgsRasterLayer, QgsMeshLayer, QgsPointCloudLayer, - QgsAnnotationLayer, + QgsRasterLayer, + QgsVectorLayer, QgsVectorTileLayer, - QgsDataSourceUri, - QgsCoordinateTransformContext ) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsmaplayermodel.py b/tests/src/python/test_qgsmaplayermodel.py index 1ebdf8cd4c87..0459e6c0a8c5 100644 --- a/tests/src/python/test_qgsmaplayermodel.py +++ b/tests/src/python/test_qgsmaplayermodel.py @@ -10,15 +10,13 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - -from qgis.core import QgsVectorLayer, QgsProject, QgsMapLayerModel, QgsApplication -from qgis.PyQt.QtCore import ( - QCoreApplication, - Qt, - QModelIndex, - QEvent +from qgis.PyQt.QtCore import QCoreApplication, QEvent, QModelIndex, Qt +from qgis.core import ( + QgsApplication, + QgsMapLayerModel, + QgsProject, + QgsVectorLayer, ) - from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsmaplayerproxymodel.py b/tests/src/python/test_qgsmaplayerproxymodel.py index 0deb7ceb5028..19dc24d8a8d7 100644 --- a/tests/src/python/test_qgsmaplayerproxymodel.py +++ b/tests/src/python/test_qgsmaplayerproxymodel.py @@ -12,15 +12,12 @@ import qgis # NOQA from qgis.core import ( - QgsVectorLayer, - QgsMeshLayer, QgsAnnotationLayer, + QgsMapLayerProxyModel, + QgsMeshLayer, QgsProject, - QgsMapLayerModel, - QgsMapLayerProxyModel + QgsVectorLayer, ) -from qgis.PyQt.QtCore import Qt, QModelIndex - from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsmaplayerserverproperties.py b/tests/src/python/test_qgsmaplayerserverproperties.py index 6dd2c4ad72fe..be7b8cbae667 100644 --- a/tests/src/python/test_qgsmaplayerserverproperties.py +++ b/tests/src/python/test_qgsmaplayerserverproperties.py @@ -13,10 +13,7 @@ __date__ = '21/06/2021' __copyright__ = 'Copyright 2021, The QGIS Project' -from qgis.core import ( - QgsMapLayerServerProperties, - QgsVectorLayer, -) +from qgis.core import QgsMapLayerServerProperties, QgsVectorLayer from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgsmaplayerstore.py b/tests/src/python/test_qgsmaplayerstore.py index 0ad129fbd5e1..1485c8382400 100644 --- a/tests/src/python/test_qgsmaplayerstore.py +++ b/tests/src/python/test_qgsmaplayerstore.py @@ -10,20 +10,20 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import os +from time import sleep + +from qgis.PyQt import sip +from qgis.PyQt.QtTest import QSignalSpy +from qgis.PyQt.QtXml import QDomDocument, QDomNode from qgis.core import ( - QgsMapLayerStore, - QgsVectorLayer, QgsMapLayer, - QgsDataProvider, + QgsMapLayerStore, QgsProject, QgsReadWriteContext, + QgsVectorLayer, ) from qgis.testing import start_app, unittest -from qgis.PyQt.QtCore import QT_VERSION_STR -from qgis.PyQt import sip -from qgis.PyQt.QtTest import QSignalSpy -from qgis.PyQt.QtXml import QDomDocument, QDomNode -from time import sleep + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsmaplayerutils.py b/tests/src/python/test_qgsmaplayerutils.py index 8aefec868f43..421f158e35e9 100644 --- a/tests/src/python/test_qgsmaplayerutils.py +++ b/tests/src/python/test_qgsmaplayerutils.py @@ -11,19 +11,19 @@ import qgis # NOQA - from qgis.core import ( - QgsMapLayerUtils, + QgsAnnotationLayer, QgsCoordinateReferenceSystem, QgsCoordinateTransformContext, - QgsVectorLayer, - QgsRasterLayer, - QgsAnnotationLayer, QgsGroupLayer, + QgsMapLayerType, + QgsMapLayerUtils, QgsProject, - QgsMapLayerType + QgsRasterLayer, + QgsVectorLayer, ) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsmaprenderer.py b/tests/src/python/test_qgsmaprenderer.py index fb4dbb18675b..7114deb049e8 100644 --- a/tests/src/python/test_qgsmaprenderer.py +++ b/tests/src/python/test_qgsmaprenderer.py @@ -9,27 +9,28 @@ __date__ = '1/02/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA - -from qgis.core import (QgsMapRendererCache, - QgsMapRendererParallelJob, - QgsMapRendererSequentialJob, - QgsMapRendererCustomPainterJob, - QgsPalLayerSettings, - QgsRectangle, - QgsTextFormat, - QgsVectorLayer, - QgsVectorLayerSimpleLabeling, - QgsFeature, - QgsGeometry, - QgsMapSettings, - QgsPointXY) -from qgis.testing import start_app, unittest -from qgis.PyQt.QtCore import QSize, QThreadPool -from qgis.PyQt.QtGui import QPainter, QImage -from qgis.PyQt.QtTest import QSignalSpy from random import uniform +import qgis # NOQA +from qgis.PyQt.QtCore import QSize +from qgis.PyQt.QtGui import QImage, QPainter +from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import ( + QgsFeature, + QgsGeometry, + QgsMapRendererCache, + QgsMapRendererCustomPainterJob, + QgsMapRendererParallelJob, + QgsMapRendererSequentialJob, + QgsMapSettings, + QgsPalLayerSettings, + QgsPointXY, + QgsRectangle, + QgsTextFormat, + QgsVectorLayer, + QgsVectorLayerSimpleLabeling, +) +from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgsmaprenderercache.py b/tests/src/python/test_qgsmaprenderercache.py index ce9ca6cf8383..a3695429b2cf 100644 --- a/tests/src/python/test_qgsmaprenderercache.py +++ b/tests/src/python/test_qgsmaprenderercache.py @@ -9,17 +9,20 @@ __date__ = '1/02/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA +from time import sleep -from qgis.core import (QgsMapRendererCache, - QgsRectangle, - QgsVectorLayer, - QgsProject, - QgsMapToPixel) -from qgis.testing import start_app, unittest +import qgis # NOQA from qgis.PyQt.QtCore import QCoreApplication from qgis.PyQt.QtGui import QImage -from time import sleep +from qgis.core import ( + QgsMapRendererCache, + QgsMapToPixel, + QgsProject, + QgsRectangle, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest + start_app() diff --git a/tests/src/python/test_qgsmapthemecollection.py b/tests/src/python/test_qgsmapthemecollection.py index c132ff1e9e21..785523b73dd0 100644 --- a/tests/src/python/test_qgsmapthemecollection.py +++ b/tests/src/python/test_qgsmapthemecollection.py @@ -10,14 +10,10 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsMapThemeCollection, - QgsProject, - QgsVectorLayer) -from qgis.gui import (QgsLayerTreeMapCanvasBridge, - QgsMapCanvas) -from qgis.testing import start_app, unittest from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import QgsMapThemeCollection, QgsProject, QgsVectorLayer +from qgis.gui import QgsLayerTreeMapCanvasBridge, QgsMapCanvas +from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgsmapunitscale.py b/tests/src/python/test_qgsmapunitscale.py index 269426ccc5fc..26e21a8f39f5 100644 --- a/tests/src/python/test_qgsmapunitscale.py +++ b/tests/src/python/test_qgsmapunitscale.py @@ -10,9 +10,14 @@ __copyright__ = 'Copyright 2015, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsMapUnitScale, QgsRenderContext, QgsSymbolLayerUtils, QgsMapSettings, QgsRectangle) from qgis.PyQt.QtCore import QSize +from qgis.core import ( + QgsMapSettings, + QgsMapUnitScale, + QgsRectangle, + QgsRenderContext, + QgsSymbolLayerUtils, +) from qgis.testing import unittest diff --git a/tests/src/python/test_qgsmargins.py b/tests/src/python/test_qgsmargins.py index f42f1b171d19..7ba9fa0d93f4 100644 --- a/tests/src/python/test_qgsmargins.py +++ b/tests/src/python/test_qgsmargins.py @@ -12,8 +12,8 @@ import qgis # NOQA -from qgis.testing import unittest from qgis.core import QgsMargins +from qgis.testing import unittest class TestQgsOptional(unittest.TestCase): diff --git a/tests/src/python/test_qgsmarkerlinesymbollayer.py b/tests/src/python/test_qgsmarkerlinesymbollayer.py index 835c19c46102..90653c85f3e4 100644 --- a/tests/src/python/test_qgsmarkerlinesymbollayer.py +++ b/tests/src/python/test_qgsmarkerlinesymbollayer.py @@ -19,44 +19,43 @@ __date__ = 'November 2018' __copyright__ = '(C) 2018, Nyall Dawson' -import qgis # NOQA - import os -from utilities import unitTestDataPath -from qgis.PyQt.QtCore import QDir, Qt, QSize -from qgis.PyQt.QtGui import QImage, QColor, QPainter +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QSize, Qt +from qgis.PyQt.QtGui import QColor, QImage, QPainter from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + Qgis, + QgsFeature, + QgsFillSymbol, + QgsFontMarkerSymbolLayer, + QgsFontUtils, + QgsGeometry, + QgsGeometryGeneratorSymbolLayer, + QgsLineSymbol, + QgsLineSymbolLayer, + QgsMapSettings, + QgsMarkerLineSymbolLayer, + QgsMarkerSymbol, + QgsMultiRenderChecker, + QgsProperty, + QgsReadWriteContext, + QgsRectangle, + QgsRenderChecker, + QgsRenderContext, + QgsSimpleMarkerSymbolLayer, + QgsSingleSymbolRenderer, + QgsSymbol, + QgsSymbolLayer, + QgsSymbolLayerUtils, + QgsTemplatedLineSymbolLayerBase, + QgsUnitTypes, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest -from qgis.core import (Qgis, - QgsGeometry, - QgsFillSymbol, - QgsRenderContext, - QgsFeature, - QgsMapSettings, - QgsRenderChecker, - QgsVectorLayer, - QgsReadWriteContext, - QgsSymbolLayerUtils, - QgsSimpleMarkerSymbolLayer, - QgsLineSymbolLayer, - QgsTemplatedLineSymbolLayerBase, - QgsMarkerLineSymbolLayer, - QgsMarkerSymbol, - QgsGeometryGeneratorSymbolLayer, - QgsSymbol, - QgsFontMarkerSymbolLayer, - QgsFontUtils, - QgsLineSymbol, - QgsSymbolLayer, - QgsProperty, - QgsRectangle, - QgsUnitTypes, - QgsMultiRenderChecker, - QgsSingleSymbolRenderer - ) - -from qgis.testing import unittest, start_app +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsmediawidget.py b/tests/src/python/test_qgsmediawidget.py index 42add122749e..fe712a8b692a 100644 --- a/tests/src/python/test_qgsmediawidget.py +++ b/tests/src/python/test_qgsmediawidget.py @@ -12,7 +12,6 @@ import qgis # NOQA from qgis.gui import QgsMediaWidget -from qgis.core import QgsApplication from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsmergedfeaturerenderer.py b/tests/src/python/test_qgsmergedfeaturerenderer.py index 1a5bc4400c6f..7ac5deda8018 100644 --- a/tests/src/python/test_qgsmergedfeaturerenderer.py +++ b/tests/src/python/test_qgsmergedfeaturerenderer.py @@ -9,30 +9,29 @@ __date__ = '30/12/2020' __copyright__ = 'Copyright 2020, The QGIS Project' -import qgis # NOQA - import os -from qgis.PyQt.QtCore import QSize, QDir, Qt +import qgis # NOQA +from qgis.PyQt.QtCore import QDir from qgis.PyQt.QtGui import QColor - -from qgis.core import (QgsRenderChecker, - QgsMapSettings, - QgsVectorLayer, - QgsMergedFeatureRenderer, - QgsSingleSymbolRenderer, - QgsFillSymbol, - QgsSimpleFillSymbolLayer, - QgsCategorizedSymbolRenderer, - QgsRendererCategory, - QgsSimpleLineSymbolLayer, - QgsMarkerLineSymbolLayer, - QgsLineSymbol, - QgsTemplatedLineSymbolLayerBase, - QgsMarkerSymbol, - QgsMarkerSymbolLayer - ) +from qgis.core import ( + QgsCategorizedSymbolRenderer, + QgsFillSymbol, + QgsLineSymbol, + QgsMapSettings, + QgsMarkerLineSymbolLayer, + QgsMarkerSymbol, + QgsMergedFeatureRenderer, + QgsRenderChecker, + QgsRendererCategory, + QgsSimpleFillSymbolLayer, + QgsSimpleLineSymbolLayer, + QgsSingleSymbolRenderer, + QgsTemplatedLineSymbolLayerBase, + QgsVectorLayer, +) from qgis.testing import unittest + from utilities import unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsmeshlayerelevationproperties.py b/tests/src/python/test_qgsmeshlayerelevationproperties.py index f33b3e7b46dc..eab718a363f3 100644 --- a/tests/src/python/test_qgsmeshlayerelevationproperties.py +++ b/tests/src/python/test_qgsmeshlayerelevationproperties.py @@ -10,17 +10,14 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( + Qgis, + QgsFillSymbol, + QgsLineSymbol, QgsMeshLayerElevationProperties, QgsReadWriteContext, - QgsLineSymbol, - QgsFillSymbol, - Qgis ) - -from qgis.PyQt.QtXml import QDomDocument - from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsmeshlayerprofilegenerator.py b/tests/src/python/test_qgsmeshlayerprofilegenerator.py index ed24d8acd86c..bc4adf9afaba 100644 --- a/tests/src/python/test_qgsmeshlayerprofilegenerator.py +++ b/tests/src/python/test_qgsmeshlayerprofilegenerator.py @@ -12,25 +12,17 @@ import os import qgis # NOQA - -from qgis.PyQt.QtCore import QTemporaryDir - from qgis.core import ( - QgsMeshLayer, - QgsLineString, - QgsProfileRequest, QgsCoordinateReferenceSystem, - QgsCoordinateTransformContext, - QgsFlatTerrainProvider, - QgsMeshTerrainProvider, + QgsLineString, + QgsMeshLayer, + QgsProfileIdentifyContext, QgsProfilePoint, + QgsProfileRequest, QgsProfileSnapContext, - QgsProfileIdentifyContext ) - -from qgis.PyQt.QtXml import QDomDocument - from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsmessagelog.py b/tests/src/python/test_qgsmessagelog.py index c12ea7e6ff6d..35ee59b7d2f5 100644 --- a/tests/src/python/test_qgsmessagelog.py +++ b/tests/src/python/test_qgsmessagelog.py @@ -10,16 +10,16 @@ __copyright__ = 'Copyright 2018, The QGIS Project' import qgis # NOQA - -from qgis.core import (Qgis, - QgsApplication, - QgsMessageLog, - QgsMessageLogNotifyBlocker) - from qgis.PyQt.QtTest import QSignalSpy - +from qgis.core import ( + Qgis, + QgsApplication, + QgsMessageLog, + QgsMessageLogNotifyBlocker, +) from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath) + +from utilities import unitTestDataPath app = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsmetadatabase.py b/tests/src/python/test_qgsmetadatabase.py index 217f5fe7437b..6e98a547a269 100644 --- a/tests/src/python/test_qgsmetadatabase.py +++ b/tests/src/python/test_qgsmetadatabase.py @@ -12,19 +12,13 @@ __copyright__ = 'Copyright 2018, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtCore import QDate, QDateTime, QTime from qgis.PyQt.QtXml import QDomDocument - -from qgis.core import (QgsAbstractMetadataBase, - QgsCoordinateReferenceSystem, - QgsVectorLayer, - QgsNativeMetadataBaseValidator, - QgsBox3d, - QgsDateTimeRange, - Qgis) -from qgis.PyQt.QtCore import (QDate, - QTime, - QDateTime) +from qgis.core import ( + Qgis, + QgsAbstractMetadataBase, + QgsNativeMetadataBaseValidator, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsmetadatautils.py b/tests/src/python/test_qgsmetadatautils.py index e4258e35d13d..49f8889fc830 100644 --- a/tests/src/python/test_qgsmetadatautils.py +++ b/tests/src/python/test_qgsmetadatautils.py @@ -11,13 +11,8 @@ from qgis.PyQt.QtCore import QDateTime from qgis.PyQt.QtXml import QDomDocument -from qgis.core import ( - QgsMetadataUtils, - Qgis -) -from qgis.testing import (start_app, - unittest, - ) +from qgis.core import Qgis, QgsMetadataUtils +from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsmetadatawidget.py b/tests/src/python/test_qgsmetadatawidget.py index 38bcab8a9849..55495a91046c 100644 --- a/tests/src/python/test_qgsmetadatawidget.py +++ b/tests/src/python/test_qgsmetadatawidget.py @@ -12,20 +12,17 @@ __copyright__ = 'Copyright 2018, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtXml import QDomDocument - -from qgis.core import (Qgis, - QgsCoordinateReferenceSystem, - QgsAbstractMetadataBase, - QgsLayerMetadata, - QgsProjectMetadata, - QgsBox3d, - QgsDateTimeRange) -from qgis.gui import (QgsMetadataWidget) -from qgis.PyQt.QtCore import (QDate, - QTime, - QDateTime) +from qgis.PyQt.QtCore import QDate, QDateTime, QTime +from qgis.core import ( + Qgis, + QgsAbstractMetadataBase, + QgsBox3d, + QgsCoordinateReferenceSystem, + QgsDateTimeRange, + QgsLayerMetadata, + QgsProjectMetadata, +) +from qgis.gui import QgsMetadataWidget from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsmssqlsqlquerybuilder.py b/tests/src/python/test_qgsmssqlsqlquerybuilder.py index edac5e9e2f66..bc377a584b5c 100644 --- a/tests/src/python/test_qgsmssqlsqlquerybuilder.py +++ b/tests/src/python/test_qgsmssqlsqlquerybuilder.py @@ -9,15 +9,9 @@ __date__ = '25/08/2022' __copyright__ = 'Copyright 2022, The QGIS Project' -import os -import shutil -import tempfile - -from qgis.core import ( - QgsProviderSqlQueryBuilder, - QgsProviderRegistry -) +from qgis.core import QgsProviderRegistry from qgis.testing import start_app, unittest + from utilities import unitTestDataPath app = start_app() diff --git a/tests/src/python/test_qgsmultiedittoolbutton.py b/tests/src/python/test_qgsmultiedittoolbutton.py index 154bc6473af1..843f02a5302d 100644 --- a/tests/src/python/test_qgsmultiedittoolbutton.py +++ b/tests/src/python/test_qgsmultiedittoolbutton.py @@ -12,7 +12,6 @@ import qgis # NOQA switch sip api from qgis.gui import QgsMultiEditToolButton - from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsnetworkaccessmanager.py b/tests/src/python/test_qgsnetworkaccessmanager.py index 29f0e554cc94..d224dc50bf5e 100644 --- a/tests/src/python/test_qgsnetworkaccessmanager.py +++ b/tests/src/python/test_qgsnetworkaccessmanager.py @@ -9,34 +9,22 @@ __date__ = '27/04/2022' __copyright__ = 'Copyright 2022, The QGIS Project' -import qgis # NOQA - +import http.server import os import socketserver import threading -import http.server from functools import partial -from qgis.PyQt.QtNetwork import ( - QNetworkRequest, - QNetworkReply -) -from qgis.PyQt.QtCore import ( - QUrl, - QCoreApplication -) +import qgis # NOQA +from qgis.PyQt.QtCore import QUrl +from qgis.PyQt.QtNetwork import QNetworkReply, QNetworkRequest from qgis.PyQt.QtTest import QSignalSpy -from qgis.core import (QgsNetworkAccessManager, - QgsLayout, - QgsLayoutItemMap, - QgsRectangle, - QgsCoordinateReferenceSystem, - QgsProject, - QgsReadWriteContext - ) +from qgis.core import ( + QgsNetworkAccessManager, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath -from qgslayoutchecker import QgsLayoutChecker start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsnetworkcontentfetcher.py b/tests/src/python/test_qgsnetworkcontentfetcher.py index b49c55fbca5b..8475b5de6ba5 100644 --- a/tests/src/python/test_qgsnetworkcontentfetcher.py +++ b/tests/src/python/test_qgsnetworkcontentfetcher.py @@ -10,17 +10,18 @@ __date__ = '4/28/2015' __copyright__ = 'Copyright 2015, The QGIS Project' -import qgis # NOQA - +import http.server import os -from qgis.testing import unittest, start_app -from qgis.core import QgsNetworkContentFetcher -from utilities import unitTestDataPath -from qgis.PyQt.QtCore import QUrl -from qgis.PyQt.QtNetwork import QNetworkReply, QNetworkRequest import socketserver import threading -import http.server + +import qgis # NOQA +from qgis.PyQt.QtCore import QUrl +from qgis.PyQt.QtNetwork import QNetworkReply, QNetworkRequest +from qgis.core import QgsNetworkContentFetcher +from qgis.testing import start_app, unittest + +from utilities import unitTestDataPath app = start_app() diff --git a/tests/src/python/test_qgsnetworkcontentfetcherregistry.py b/tests/src/python/test_qgsnetworkcontentfetcherregistry.py index 34a845df329a..125ef8f0520f 100644 --- a/tests/src/python/test_qgsnetworkcontentfetcherregistry.py +++ b/tests/src/python/test_qgsnetworkcontentfetcherregistry.py @@ -11,16 +11,20 @@ __date__ = '27/04/2018' __copyright__ = 'Copyright 2018, The QGIS Project' -import qgis # NOQA - +import http.server import os -from qgis.testing import unittest, start_app -from qgis.core import QgsNetworkContentFetcherRegistry, QgsFetchedContent, QgsApplication -from utilities import unitTestDataPath -from qgis.PyQt.QtNetwork import QNetworkReply, QNetworkRequest import socketserver import threading -import http.server + +import qgis # NOQA +from qgis.PyQt.QtNetwork import QNetworkReply +from qgis.core import ( + QgsApplication, + QgsFetchedContent, +) +from qgis.testing import start_app, unittest + +from utilities import unitTestDataPath app = start_app() diff --git a/tests/src/python/test_qgsnetworkcontentfetchertask.py b/tests/src/python/test_qgsnetworkcontentfetchertask.py index 19e76d89adf1..66978acfd817 100644 --- a/tests/src/python/test_qgsnetworkcontentfetchertask.py +++ b/tests/src/python/test_qgsnetworkcontentfetchertask.py @@ -11,17 +11,21 @@ __date__ = '29/03/2018' __copyright__ = 'Copyright 2018, The QGIS Project' -import qgis # NOQA - +import http.server import os -from qgis.testing import unittest, start_app -from qgis.core import QgsNetworkContentFetcher, QgsNetworkContentFetcherTask, QgsApplication -from utilities import unitTestDataPath -from qgis.PyQt.QtCore import QUrl -from qgis.PyQt.QtNetwork import QNetworkReply, QNetworkRequest import socketserver import threading -import http.server + +import qgis # NOQA +from qgis.PyQt.QtCore import QUrl +from qgis.PyQt.QtNetwork import QNetworkReply +from qgis.core import ( + QgsApplication, + QgsNetworkContentFetcherTask, +) +from qgis.testing import start_app, unittest + +from utilities import unitTestDataPath app = start_app() diff --git a/tests/src/python/test_qgsnetworkreply.py b/tests/src/python/test_qgsnetworkreply.py index 849fa2c88508..5c1db898cd55 100644 --- a/tests/src/python/test_qgsnetworkreply.py +++ b/tests/src/python/test_qgsnetworkreply.py @@ -12,15 +12,8 @@ import qgis # NOQA -import os -from qgis.testing import unittest, start_app from qgis.core import QgsNetworkReplyContent -from utilities import unitTestDataPath -from qgis.PyQt.QtCore import QUrl -from qgis.PyQt.QtNetwork import QNetworkReply, QNetworkRequest -import socketserver -import threading -import http.server +from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgsnewgeopackagelayerdialog.py b/tests/src/python/test_qgsnewgeopackagelayerdialog.py index b9683803e937..4a89bad5f4ae 100644 --- a/tests/src/python/test_qgsnewgeopackagelayerdialog.py +++ b/tests/src/python/test_qgsnewgeopackagelayerdialog.py @@ -10,15 +10,20 @@ __copyright__ = 'Copyright 2016, Even Rouault' import os -import tempfile import shutil +import tempfile from qgis.PyQt.QtCore import QCoreApplication, Qt -from qgis.PyQt.QtWidgets import QLineEdit, QDialogButtonBox, QTreeWidget, QComboBox, QToolButton from qgis.PyQt.QtTest import QTest - +from qgis.PyQt.QtWidgets import ( + QComboBox, + QDialogButtonBox, + QLineEdit, + QToolButton, + QTreeWidget, +) from qgis.core import QgsProject, QgsSettings, QgsWkbTypes -from qgis.gui import QgsNewGeoPackageLayerDialog, QgsFileWidget +from qgis.gui import QgsFileWidget, QgsNewGeoPackageLayerDialog from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsnewvectortabledialog.py b/tests/src/python/test_qgsnewvectortabledialog.py index 9336f35fea19..6606f10b36bf 100644 --- a/tests/src/python/test_qgsnewvectortabledialog.py +++ b/tests/src/python/test_qgsnewvectortabledialog.py @@ -13,25 +13,23 @@ __revision__ = '$Format:%H$' -import tempfile import shutil +import tempfile +from qgis.PyQt.QtWidgets import ( + QCheckBox, + QComboBox, + QDialogButtonBox, + QLineEdit, +) from qgis.core import ( - QgsApplication, + QgsFields, QgsProviderRegistry, QgsVectorLayer, QgsWkbTypes, - QgsFields ) - from qgis.gui import QgsNewVectorTableDialog from qgis.testing import start_app, unittest -from qgis.PyQt.QtWidgets import ( - QDialogButtonBox, - QLineEdit, - QComboBox, - QCheckBox -) from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsnoapplication.py b/tests/src/python/test_qgsnoapplication.py index 9e6cd649a352..f18fefc0ac88 100644 --- a/tests/src/python/test_qgsnoapplication.py +++ b/tests/src/python/test_qgsnoapplication.py @@ -9,10 +9,11 @@ __date__ = '1/02/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA import sys + +import qgis # NOQA from qgis.PyQt.QtCore import QCoreApplication -from qgis.core import (QgsApplication) +from qgis.core import QgsApplication from qgis.testing import unittest """ diff --git a/tests/src/python/test_qgsnominatimgeocoder.py b/tests/src/python/test_qgsnominatimgeocoder.py index 5a07e9696546..8124368b1901 100644 --- a/tests/src/python/test_qgsnominatimgeocoder.py +++ b/tests/src/python/test_qgsnominatimgeocoder.py @@ -12,16 +12,11 @@ import tempfile import qgis # NOQA -from qgis.PyQt.QtCore import ( - QCoreApplication, - QUrl -) +from qgis.PyQt.QtCore import QCoreApplication from qgis.core import ( - QgsSettings, - QgsRectangle, QgsNominatimGeocoder, - QgsGeocoderContext, - QgsCoordinateTransformContext + QgsRectangle, + QgsSettings, ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsnullsymbolrenderer.py b/tests/src/python/test_qgsnullsymbolrenderer.py index 4431ff3d8758..0ba2aea8373e 100644 --- a/tests/src/python/test_qgsnullsymbolrenderer.py +++ b/tests/src/python/test_qgsnullsymbolrenderer.py @@ -19,19 +19,20 @@ __date__ = 'April 2016' __copyright__ = '(C) 2016, Nyall Dawson' -import qgis # NOQA - import os +import qgis # NOQA from qgis.PyQt.QtCore import QSize - -from qgis.core import (QgsVectorLayer, - QgsProject, - QgsRectangle, - QgsMultiRenderChecker, - QgsNullSymbolRenderer) +from qgis.core import ( + QgsMultiRenderChecker, + QgsNullSymbolRenderer, + QgsProject, + QgsRectangle, + QgsVectorLayer, +) from qgis.testing import start_app, unittest from qgis.testing.mocked import get_iface + from utilities import unitTestDataPath # Convenience instances in case you may need them diff --git a/tests/src/python/test_qgsnumericformat.py b/tests/src/python/test_qgsnumericformat.py index f8ba96d3305b..2a194614636b 100644 --- a/tests/src/python/test_qgsnumericformat.py +++ b/tests/src/python/test_qgsnumericformat.py @@ -10,21 +10,22 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsFallbackNumericFormat, - QgsBasicNumericFormat, - QgsNumericFormatContext, - QgsBearingNumericFormat, - QgsPercentageNumericFormat, - QgsScientificNumericFormat, - QgsCurrencyNumericFormat, - QgsNumericFormatRegistry, - QgsNumericFormat, - QgsFractionNumericFormat, - QgsGeographicCoordinateNumericFormat, - QgsReadWriteContext) -from qgis.testing import start_app, unittest from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsBasicNumericFormat, + QgsBearingNumericFormat, + QgsCurrencyNumericFormat, + QgsFallbackNumericFormat, + QgsFractionNumericFormat, + QgsGeographicCoordinateNumericFormat, + QgsNumericFormat, + QgsNumericFormatContext, + QgsNumericFormatRegistry, + QgsPercentageNumericFormat, + QgsReadWriteContext, + QgsScientificNumericFormat, +) +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsnumericformatgui.py b/tests/src/python/test_qgsnumericformatgui.py index 4ea30520cd30..f09ea4219a63 100644 --- a/tests/src/python/test_qgsnumericformatgui.py +++ b/tests/src/python/test_qgsnumericformatgui.py @@ -10,27 +10,26 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsFallbackNumericFormat, - QgsBasicNumericFormat, - QgsNumericFormatContext, - QgsBearingNumericFormat, - QgsPercentageNumericFormat, - QgsScientificNumericFormat, - QgsCurrencyNumericFormat, - QgsGeographicCoordinateNumericFormat, - QgsNumericFormatRegistry, - QgsNumericFormat, - QgsApplication) - -from qgis.gui import (QgsNumericFormatSelectorWidget, - QgsNumericFormatGuiRegistry, - QgsNumericFormatConfigurationWidgetFactory, - QgsNumericFormatWidget, - QgsGui) - -from qgis.testing import start_app, unittest from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import ( + QgsApplication, + QgsBasicNumericFormat, + QgsBearingNumericFormat, + QgsCurrencyNumericFormat, + QgsFallbackNumericFormat, + QgsGeographicCoordinateNumericFormat, + QgsNumericFormat, + QgsPercentageNumericFormat, + QgsScientificNumericFormat, +) +from qgis.gui import ( + QgsGui, + QgsNumericFormatConfigurationWidgetFactory, + QgsNumericFormatGuiRegistry, + QgsNumericFormatSelectorWidget, + QgsNumericFormatWidget, +) +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsobjectcustomproperties.py b/tests/src/python/test_qgsobjectcustomproperties.py index 084d7ed60037..666ac829c9b9 100644 --- a/tests/src/python/test_qgsobjectcustomproperties.py +++ b/tests/src/python/test_qgsobjectcustomproperties.py @@ -10,11 +10,9 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtXml import QDomDocument from qgis.core import QgsObjectCustomProperties - from qgis.testing import start_app, unittest -from qgis.PyQt.QtXml import QDomDocument start_app() diff --git a/tests/src/python/test_qgsogcutils.py b/tests/src/python/test_qgsogcutils.py index a531baaa3bc1..3e1ea8d9836e 100644 --- a/tests/src/python/test_qgsogcutils.py +++ b/tests/src/python/test_qgsogcutils.py @@ -14,11 +14,9 @@ __copyright__ = 'Copyright 2019, The QGIS Project' import qgis # NOQA switch sip api - from qgis.PyQt.QtCore import QVariant from qgis.PyQt.QtXml import QDomDocument -from qgis.core import QgsOgcUtils, QgsVectorLayer, QgsField - +from qgis.core import QgsField, QgsOgcUtils, QgsVectorLayer from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsopacitywidget.py b/tests/src/python/test_qgsopacitywidget.py index 63f93e86d240..c0bba9663218 100644 --- a/tests/src/python/test_qgsopacitywidget.py +++ b/tests/src/python/test_qgsopacitywidget.py @@ -11,8 +11,6 @@ import qgis # NOQA -from qgis.gui import QgsOpacityWidget - from qgis.PyQt.QtTest import QSignalSpy from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsoptional.py b/tests/src/python/test_qgsoptional.py index e90bf9a5fe81..5eba0612ae8f 100644 --- a/tests/src/python/test_qgsoptional.py +++ b/tests/src/python/test_qgsoptional.py @@ -16,8 +16,8 @@ import qgis # NOQA +from qgis.core import QgsExpression, QgsOptionalExpression from qgis.testing import unittest -from qgis.core import QgsOptionalExpression, QgsExpression class TestQgsOptional(unittest.TestCase): diff --git a/tests/src/python/test_qgsowsconnection.py b/tests/src/python/test_qgsowsconnection.py index 104ccdbbc519..02b54994a5fd 100644 --- a/tests/src/python/test_qgsowsconnection.py +++ b/tests/src/python/test_qgsowsconnection.py @@ -10,12 +10,9 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.testing import unittest, start_app -from qgis.core import (QgsOwsConnection, - QgsDataSourceUri, - QgsSettings) from qgis.PyQt.QtCore import QCoreApplication +from qgis.core import QgsDataSourceUri, QgsOwsConnection, QgsSettings +from qgis.testing import start_app, unittest class TestQgsOwsConnection(unittest.TestCase): diff --git a/tests/src/python/test_qgspallabeling_base.py b/tests/src/python/test_qgspallabeling_base.py index 6141ed8ebe83..026c5436b62f 100644 --- a/tests/src/python/test_qgspallabeling_base.py +++ b/tests/src/python/test_qgspallabeling_base.py @@ -15,54 +15,48 @@ __date__ = '07/09/2013' __copyright__ = 'Copyright 2013, The QGIS Project' -import qgis # NOQA - -import os -import sys import datetime import glob +import os import shutil +import sys from collections.abc import Callable -from qgis.PyQt.QtCore import QSize, qDebug, Qt -from qgis.PyQt.QtGui import QFont, QColor - +import qgis # NOQA +from qgis.PyQt.QtCore import QSize, Qt, qDebug +from qgis.PyQt.QtGui import QColor, QFont from qgis.core import ( QgsCoordinateReferenceSystem, QgsCoordinateTransform, - QgsDataSourceUri, QgsGeometry, QgsLabelingEngineSettings, - QgsProject, QgsMapSettings, + QgsMultiRenderChecker, QgsPalLabeling, QgsPalLayerSettings, - QgsProviderRegistry, + QgsProject, QgsStringReplacementCollection, + QgsTextFormat, + QgsUnitTypes, QgsVectorLayer, QgsVectorLayerSimpleLabeling, - QgsMultiRenderChecker, - QgsUnitTypes, - QgsVectorTileLayer, + QgsVectorTileBasicLabeling, QgsVectorTileBasicLabelingStyle, + QgsVectorTileLayer, QgsWkbTypes, - QgsVectorTileBasicLabeling, - QgsTextFormat ) - from qgis.testing import start_app, unittest from qgis.testing.mocked import get_iface from utilities import ( - unitTestDataPath, getTempfilePath, - renderMapToImage, - loadTestFonts, getTestFont, - openInBrowserTab + loadTestFonts, + openInBrowserTab, + renderMapToImage, + unitTestDataPath, ) - start_app(sys.platform != 'darwin') # No cleanup on mac os x, it crashes the pallabelingcanvas test on exit FONTSLOADED = loadTestFonts() diff --git a/tests/src/python/test_qgspallabeling_canvas.py b/tests/src/python/test_qgspallabeling_canvas.py index a93d57819c55..0b8209b586d8 100644 --- a/tests/src/python/test_qgspallabeling_canvas.py +++ b/tests/src/python/test_qgspallabeling_canvas.py @@ -14,25 +14,16 @@ __date__ = '07/09/2013' __copyright__ = 'Copyright 2013, The QGIS Project' -import qgis # NOQA - -import sys import os -from qgis.PyQt.QtCore import qDebug, QThreadPool -from qgis.core import QgsVectorLayerSimpleLabeling +import sys -from utilities import ( - getTempfilePath, - renderMapToImage, - mapSettingsString -) +import qgis # NOQA +from qgis.PyQt.QtCore import qDebug +from qgis.core import QgsVectorLayerSimpleLabeling from test_qgspallabeling_base import TestQgsPalLabeling, runSuite -from test_qgspallabeling_tests import ( - TestPointBase, - TestLineBase, - suiteTests -) +from test_qgspallabeling_tests import TestLineBase, TestPointBase, suiteTests +from utilities import getTempfilePath, mapSettingsString, renderMapToImage class TestCanvasBase(TestQgsPalLabeling): diff --git a/tests/src/python/test_qgspallabeling_layout.py b/tests/src/python/test_qgspallabeling_layout.py index 15ad641fd839..67d243649a9f 100644 --- a/tests/src/python/test_qgspallabeling_layout.py +++ b/tests/src/python/test_qgspallabeling_layout.py @@ -14,40 +14,30 @@ __date__ = '2014/02/21' __copyright__ = 'Copyright 2013, The QGIS Project' -import qgis # NOQA - -import sys import os import subprocess +import sys -from qgis.PyQt.QtCore import QRect, QRectF, QSize, QSizeF, qDebug, QThreadPool -from qgis.PyQt.QtGui import QImage, QColor, QPainter +import qgis # NOQA +from qgis.PyQt.QtCore import QRect, QRectF, QSize, QSizeF, qDebug +from qgis.PyQt.QtGui import QColor, QImage, QPainter from qgis.PyQt.QtPrintSupport import QPrinter -from qgis.PyQt.QtSvg import QSvgRenderer, QSvgGenerator - -from qgis.core import (QgsLayout, - QgsLayoutItemPage, - QgsLayoutSize, - QgsLayoutItemMap, - QgsLayoutExporter, - QgsMapSettings, - QgsProject, - QgsVectorLayerSimpleLabeling, - QgsLabelingEngineSettings) - - -from utilities import ( - getTempfilePath, - getExecutablePath, - mapSettingsString +from qgis.PyQt.QtSvg import QSvgGenerator, QSvgRenderer +from qgis.core import ( + QgsLabelingEngineSettings, + QgsLayout, + QgsLayoutExporter, + QgsLayoutItemMap, + QgsLayoutItemPage, + QgsLayoutSize, + QgsMapSettings, + QgsProject, + QgsVectorLayerSimpleLabeling, ) from test_qgspallabeling_base import TestQgsPalLabeling, runSuite -from test_qgspallabeling_tests import ( - TestPointBase, - TestLineBase, - suiteTests -) +from test_qgspallabeling_tests import TestLineBase, TestPointBase, suiteTests +from utilities import getExecutablePath, getTempfilePath, mapSettingsString # PDF-to-image utility # look for Poppler w/ Cairo, then muPDF diff --git a/tests/src/python/test_qgspallabeling_placement.py b/tests/src/python/test_qgspallabeling_placement.py index 178e8239af26..cb8dd20f60e2 100644 --- a/tests/src/python/test_qgspallabeling_placement.py +++ b/tests/src/python/test_qgspallabeling_placement.py @@ -13,25 +13,24 @@ __date__ = '2015-08-24' __copyright__ = 'Copyright 2015, The QGIS Project' -import qgis # NOQA - import os import sys -from qgis.PyQt.QtCore import QThreadPool, qDebug - -from qgis.core import (QgsLabelingEngineSettings, - QgsPalLayerSettings, - QgsSingleSymbolRenderer, - QgsMarkerSymbol, - QgsProperty, - QgsVectorLayerSimpleLabeling, - QgsLabelObstacleSettings, - QgsLabeling) -from utilities import getTempfilePath, renderMapToImage, mapSettingsString +import qgis # NOQA +from qgis.PyQt.QtCore import qDebug +from qgis.core import ( + QgsLabeling, + QgsLabelingEngineSettings, + QgsLabelObstacleSettings, + QgsMarkerSymbol, + QgsPalLayerSettings, + QgsProperty, + QgsSingleSymbolRenderer, + QgsVectorLayerSimpleLabeling, +) from test_qgspallabeling_base import TestQgsPalLabeling, runSuite -from qgis.testing import unittest +from utilities import getTempfilePath, mapSettingsString, renderMapToImage # noinspection PyPep8Naming diff --git a/tests/src/python/test_qgspallabeling_server.py b/tests/src/python/test_qgspallabeling_server.py index 4d1c088bef45..7bfcc94dec26 100644 --- a/tests/src/python/test_qgspallabeling_server.py +++ b/tests/src/python/test_qgspallabeling_server.py @@ -14,23 +14,19 @@ __date__ = '07/12/2013' __copyright__ = 'Copyright 2013, The QGIS Project' -import qgis # NOQA - -import sys -import os import glob +import os import shutil +import sys +import qgis # NOQA from qgis.PyQt.QtCore import qDebug - -from qgis.core import QgsProject, QgsApplication, QgsSettings, QgsPalLabeling - -from utilities import mapSettingsString +from qgis.core import QgsApplication, QgsProject, QgsSettings from qgis_local_server import getLocalServer - from test_qgspallabeling_base import TestQgsPalLabeling, runSuite -from test_qgspallabeling_tests import TestPointBase, TestLineBase, suiteTests +from test_qgspallabeling_tests import TestLineBase, TestPointBase, suiteTests +from utilities import mapSettingsString MAPSERV = getLocalServer() diff --git a/tests/src/python/test_qgspallabeling_tests.py b/tests/src/python/test_qgspallabeling_tests.py index 45c89b40a1bb..bba832b07809 100644 --- a/tests/src/python/test_qgspallabeling_tests.py +++ b/tests/src/python/test_qgspallabeling_tests.py @@ -13,16 +13,21 @@ __date__ = '07/16/2013' __copyright__ = 'Copyright 2013, The QGIS Project' -import qgis # NOQA - import os -from qgis.PyQt.QtCore import Qt, QPointF, QSizeF +import qgis # NOQA +from qgis.PyQt.QtCore import QPointF, QSizeF, Qt from qgis.PyQt.QtGui import QFont - -from qgis.core import QgsLabelingEngineSettings, QgsPalLayerSettings, QgsUnitTypes, QgsTextBackgroundSettings, \ - QgsProject, QgsExpressionContextUtils, QgsExpressionContext -from qgis.core import QgsCoordinateReferenceSystem +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsExpressionContext, + QgsExpressionContextUtils, + QgsLabelingEngineSettings, + QgsPalLayerSettings, + QgsProject, + QgsTextBackgroundSettings, + QgsUnitTypes, +) from utilities import svgSymbolsPath diff --git a/tests/src/python/test_qgspanelwidget.py b/tests/src/python/test_qgspanelwidget.py index 078ccba6aa10..2531c420a020 100644 --- a/tests/src/python/test_qgspanelwidget.py +++ b/tests/src/python/test_qgspanelwidget.py @@ -10,8 +10,7 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtWidgets import QWidget, QDialog +from qgis.PyQt.QtWidgets import QDialog, QWidget from qgis.gui import QgsPanelWidget from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgspanelwidgetstack.py b/tests/src/python/test_qgspanelwidgetstack.py index 1ca487dadb33..eca71898909b 100644 --- a/tests/src/python/test_qgspanelwidgetstack.py +++ b/tests/src/python/test_qgspanelwidgetstack.py @@ -10,10 +10,9 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtTest import QSignalSpy from qgis.gui import QgsPanelWidget, QgsPanelWidgetStack from qgis.testing import start_app, unittest -from qgis.PyQt.QtTest import QSignalSpy start_app() diff --git a/tests/src/python/test_qgspathresolver.py b/tests/src/python/test_qgspathresolver.py index 4ef909de8c7c..beae80c12bef 100644 --- a/tests/src/python/test_qgspathresolver.py +++ b/tests/src/python/test_qgspathresolver.py @@ -9,18 +9,19 @@ __date__ = '22/07/2019' __copyright__ = 'Copyright 2019, The QGIS Project' -import qgis # NOQA - -import tempfile -import os import gc +import os +import tempfile + +import qgis # NOQA from qgis.core import ( + QgsApplication, QgsPathResolver, - QgsVectorLayer, QgsProject, - QgsApplication + QgsVectorLayer, ) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsplot.py b/tests/src/python/test_qgsplot.py index eef0f0e7e528..75e099cf7f0a 100644 --- a/tests/src/python/test_qgsplot.py +++ b/tests/src/python/test_qgsplot.py @@ -10,35 +10,23 @@ __copyright__ = 'Copyright 2022, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtCore import ( - QDir, - Qt, - QSizeF -) -from qgis.PyQt.QtGui import ( - QImage, - QPainter, - QColor -) - +from qgis.PyQt.QtCore import QDir, QSizeF, Qt +from qgis.PyQt.QtGui import QColor, QImage, QPainter +from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( Qgs2DPlot, - QgsRenderContext, - QgsRenderChecker, - QgsFontUtils, - QgsTextFormat, QgsBasicNumericFormat, QgsFillSymbol, + QgsFontUtils, QgsLineSymbol, - QgsReadWriteContext, + QgsPalLayerSettings, QgsProperty, + QgsReadWriteContext, + QgsRenderChecker, + QgsRenderContext, QgsSymbolLayer, - QgsPalLayerSettings + QgsTextFormat, ) - -from qgis.PyQt.QtXml import QDomDocument, QDomElement - from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgspoint.py b/tests/src/python/test_qgspoint.py index d2a812f8834c..fd12f3ea7f79 100644 --- a/tests/src/python/test_qgspoint.py +++ b/tests/src/python/test_qgspoint.py @@ -10,10 +10,8 @@ __copyright__ = 'Copyright 2012, The QGIS Project' import qgis # NOQA - -from qgis.core import QgsPointXY, QgsPoint, QgsWkbTypes from qgis.PyQt.QtCore import QPointF - +from qgis.core import QgsPoint, QgsPointXY, QgsWkbTypes from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgspointcloudattributebyramprenderer.py b/tests/src/python/test_qgspointcloudattributebyramprenderer.py index 2625531a60f3..913c6231034b 100644 --- a/tests/src/python/test_qgspointcloudattributebyramprenderer.py +++ b/tests/src/python/test_qgspointcloudattributebyramprenderer.py @@ -10,35 +10,32 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtCore import QDir, QSize, Qt +from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( - QgsProviderRegistry, - QgsPointCloudLayer, + QgsColorRampLegendNode, + QgsColorRampShader, + QgsCoordinateReferenceSystem, + QgsDoubleRange, + QgsLayerTreeLayer, + QgsMapSettings, + QgsMapUnitScale, + QgsMultiRenderChecker, QgsPointCloudAttributeByRampRenderer, + QgsPointCloudLayer, + QgsPointCloudRenderContext, QgsPointCloudRenderer, + QgsProviderRegistry, QgsReadWriteContext, - QgsRenderContext, - QgsPointCloudRenderContext, - QgsVector3D, - QgsMultiRenderChecker, - QgsMapSettings, QgsRectangle, - QgsUnitTypes, - QgsMapUnitScale, - QgsCoordinateReferenceSystem, - QgsDoubleRange, - QgsColorRampShader, + QgsRenderContext, + QgsSimpleLegendNode, QgsStyle, - QgsLayerTreeLayer, - QgsColorRampLegendNode, - QgsSimpleLegendNode + QgsUnitTypes, + QgsVector3D, ) - -from qgis.PyQt.QtCore import QDir, QSize, Qt -from qgis.PyQt.QtGui import QPainter -from qgis.PyQt.QtXml import QDomDocument - from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgspointcloudattributecombobox.py b/tests/src/python/test_qgspointcloudattributecombobox.py index 40497a4ca29e..796f1cb1db4c 100644 --- a/tests/src/python/test_qgspointcloudattributecombobox.py +++ b/tests/src/python/test_qgspointcloudattributecombobox.py @@ -10,19 +10,17 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtTest import QSignalSpy from qgis.core import ( - QgsProviderRegistry, - QgsPointCloudLayer, + QgsPointCloudAttribute, QgsPointCloudAttributeCollection, QgsPointCloudAttributeProxyModel, - QgsPointCloudAttribute + QgsPointCloudLayer, + QgsProviderRegistry, ) from qgis.gui import QgsPointCloudAttributeComboBox -from qgis.PyQt.QtCore import QVariant, Qt -from qgis.PyQt.QtTest import QSignalSpy - from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgspointcloudattributemodel.py b/tests/src/python/test_qgspointcloudattributemodel.py index 923efbcd1ea2..3eac456bc0ae 100644 --- a/tests/src/python/test_qgspointcloudattributemodel.py +++ b/tests/src/python/test_qgspointcloudattributemodel.py @@ -10,16 +10,17 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsPointCloudAttribute, - QgsPointCloudAttributeCollection, - QgsPointCloudAttributeModel, - QgsPointCloudAttributeProxyModel, - QgsProviderRegistry, - QgsPointCloudLayer) -from qgis.PyQt.QtCore import QVariant, Qt, QModelIndex - +from qgis.PyQt.QtCore import Qt +from qgis.core import ( + QgsPointCloudAttribute, + QgsPointCloudAttributeCollection, + QgsPointCloudAttributeModel, + QgsPointCloudAttributeProxyModel, + QgsPointCloudLayer, + QgsProviderRegistry, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgspointcloudclassifiedrenderer.py b/tests/src/python/test_qgspointcloudclassifiedrenderer.py index 19a14c92c415..e574a93dfb4e 100644 --- a/tests/src/python/test_qgspointcloudclassifiedrenderer.py +++ b/tests/src/python/test_qgspointcloudclassifiedrenderer.py @@ -10,37 +10,32 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtCore import QDir, QSize, Qt +from qgis.PyQt.QtGui import QColor +from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( - QgsApplication, - QgsProviderRegistry, - QgsPointCloudLayer, - QgsPointCloudClassifiedRenderer, + QgsCoordinateReferenceSystem, + QgsDoubleRange, + QgsLayerTreeLayer, + QgsLayerTreeModelLegendNode, + QgsMapSettings, + QgsMapUnitScale, + QgsMultiRenderChecker, QgsPointCloudCategory, + QgsPointCloudClassifiedRenderer, + QgsPointCloudLayer, + QgsPointCloudRenderContext, QgsPointCloudRenderer, QgsPointCloudRendererRegistry, + QgsProviderRegistry, QgsReadWriteContext, - QgsRenderContext, - QgsPointCloudRenderContext, - QgsVector3D, - QgsMultiRenderChecker, - QgsMapSettings, QgsRectangle, + QgsRenderContext, QgsUnitTypes, - QgsMapUnitScale, - QgsCoordinateReferenceSystem, - QgsDoubleRange, - QgsColorRampShader, - QgsStyle, - QgsLayerTreeLayer, - QgsLayerTreeModelLegendNode + QgsVector3D, ) - -from qgis.PyQt.QtCore import QDir, QSize, Qt -from qgis.PyQt.QtGui import QColor -from qgis.PyQt.QtXml import QDomDocument - from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgspointcloudelevationproperties.py b/tests/src/python/test_qgspointcloudelevationproperties.py index 637f6caa958c..5294d3f56469 100644 --- a/tests/src/python/test_qgspointcloudelevationproperties.py +++ b/tests/src/python/test_qgspointcloudelevationproperties.py @@ -10,23 +10,21 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtGui import QColor +from qgis.PyQt.QtTest import QSignalSpy +from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( - QgsPointCloudLayerElevationProperties, - QgsReadWriteContext, - QgsUnitTypes, Qgis, + QgsPointCloudClassifiedRenderer, QgsPointCloudLayer, + QgsPointCloudLayerElevationProperties, QgsProviderRegistry, - QgsPointCloudClassifiedRenderer + QgsReadWriteContext, + QgsUnitTypes, ) -from qgis.PyQt.QtGui import QColor -from qgis.PyQt.QtTest import QSignalSpy -from qgis.PyQt.QtXml import QDomDocument - from qgis.testing import start_app, unittest -from utilities import unitTestDataPath +from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgspointcloudextentrenderer.py b/tests/src/python/test_qgspointcloudextentrenderer.py index d10fb3717b77..32db7386d625 100644 --- a/tests/src/python/test_qgspointcloudextentrenderer.py +++ b/tests/src/python/test_qgspointcloudextentrenderer.py @@ -10,34 +10,23 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtCore import QDir, QSize, Qt +from qgis.PyQt.QtGui import QColor +from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( - QgsProviderRegistry, - QgsPointCloudLayer, - QgsPointCloudExtentRenderer, - QgsPointCloudCategory, - QgsReadWriteContext, - QgsRenderContext, - QgsPointCloudRenderContext, - QgsVector3D, - QgsMultiRenderChecker, - QgsMapSettings, - QgsRectangle, - QgsUnitTypes, - QgsMapUnitScale, QgsCoordinateReferenceSystem, - QgsDoubleRange, - QgsColorRampShader, QgsFillSymbol, QgsLayerTreeLayer, - QgsLayerTreeModelLegendNode + QgsMapSettings, + QgsMultiRenderChecker, + QgsPointCloudExtentRenderer, + QgsPointCloudLayer, + QgsProviderRegistry, + QgsReadWriteContext, + QgsRectangle, ) - -from qgis.PyQt.QtCore import QDir, QSize, Qt -from qgis.PyQt.QtGui import QColor -from qgis.PyQt.QtXml import QDomDocument - from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgspointcloudlayerprofilegenerator.py b/tests/src/python/test_qgspointcloudlayerprofilegenerator.py index 1b970b0ebc42..408dc581a498 100644 --- a/tests/src/python/test_qgspointcloudlayerprofilegenerator.py +++ b/tests/src/python/test_qgspointcloudlayerprofilegenerator.py @@ -13,32 +13,22 @@ import qgis # NOQA from qgis.PyQt.QtCore import QDir +from qgis.PyQt.QtGui import QColor from qgis.core import ( - QgsRasterLayer, - QgsLineString, - QgsProfileRequest, - QgsCoordinateReferenceSystem, - QgsVectorLayer, Qgis, - QgsRasterDemTerrainProvider, - QgsFeature, - QgsGeometry, - QgsCoordinateTransformContext, - QgsProjUtils, + QgsDoubleRange, + QgsLineString, + QgsPointCloudLayer, + QgsProfileGenerationContext, + QgsProfileIdentifyContext, QgsProfilePlotRenderer, - QgsFillSymbol, - QgsRenderChecker, - QgsCategorizedSymbolRenderer, QgsProfilePoint, + QgsProfileRequest, QgsProfileSnapContext, - QgsProfileIdentifyContext, - QgsDoubleRange, - QgsProfileGenerationContext, + QgsProviderRegistry, + QgsRenderChecker, QgsUnitTypes, - QgsPointCloudLayer, - QgsProviderRegistry ) -from qgis.PyQt.QtGui import QColor from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgspointcloudprovider.py b/tests/src/python/test_qgspointcloudprovider.py index 29431c287b5f..597f716c60c7 100644 --- a/tests/src/python/test_qgspointcloudprovider.py +++ b/tests/src/python/test_qgspointcloudprovider.py @@ -10,16 +10,14 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtCore import QDir from qgis.core import ( - QgsProviderRegistry, QgsPointCloudLayer, - QgsStatisticalSummary + QgsProviderRegistry, + QgsStatisticalSummary, ) - -from qgis.PyQt.QtCore import QDir - from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgspointcloudrgbrenderer.py b/tests/src/python/test_qgspointcloudrgbrenderer.py index 36d08f694722..e04a8aee7ee4 100644 --- a/tests/src/python/test_qgspointcloudrgbrenderer.py +++ b/tests/src/python/test_qgspointcloudrgbrenderer.py @@ -14,24 +14,24 @@ from qgis.PyQt.QtGui import QPainter from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( - QgsProviderRegistry, + QgsContrastEnhancement, + QgsCoordinateReferenceSystem, + QgsDoubleRange, + QgsGeometry, + QgsMapClippingRegion, + QgsMapSettings, + QgsMapUnitScale, + QgsMultiRenderChecker, QgsPointCloudLayer, + QgsPointCloudRenderContext, + QgsPointCloudRenderer, QgsPointCloudRgbRenderer, + QgsProviderRegistry, QgsReadWriteContext, - QgsRenderContext, - QgsPointCloudRenderContext, - QgsVector3D, - QgsMultiRenderChecker, - QgsMapSettings, QgsRectangle, - QgsContrastEnhancement, + QgsRenderContext, QgsUnitTypes, - QgsMapUnitScale, - QgsCoordinateReferenceSystem, - QgsDoubleRange, - QgsPointCloudRenderer, - QgsMapClippingRegion, - QgsGeometry + QgsVector3D, ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgspointclusterrenderer.py b/tests/src/python/test_qgspointclusterrenderer.py index 8fe9de7a76a3..49053343ee41 100644 --- a/tests/src/python/test_qgspointclusterrenderer.py +++ b/tests/src/python/test_qgspointclusterrenderer.py @@ -27,27 +27,28 @@ from qgis.PyQt.QtCore import QSize from qgis.PyQt.QtGui import QColor from qgis.PyQt.QtXml import QDomDocument - -from qgis.core import (QgsVectorLayer, - QgsProject, - QgsRectangle, - QgsMultiRenderChecker, - QgsPointClusterRenderer, - QgsUnitTypes, - QgsMapUnitScale, - QgsMarkerSymbol, - QgsSingleSymbolRenderer, - QgsReadWriteContext, - QgsPointDisplacementRenderer, - QgsMapSettings, - QgsProperty, - QgsSymbolLayer, - QgsRenderContext, - QgsFeature, - QgsGeometry - ) +from qgis.core import ( + QgsFeature, + QgsGeometry, + QgsMapSettings, + QgsMapUnitScale, + QgsMarkerSymbol, + QgsMultiRenderChecker, + QgsPointClusterRenderer, + QgsPointDisplacementRenderer, + QgsProject, + QgsProperty, + QgsReadWriteContext, + QgsRectangle, + QgsRenderContext, + QgsSingleSymbolRenderer, + QgsSymbolLayer, + QgsUnitTypes, + QgsVectorLayer, +) from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath) + +from utilities import unitTestDataPath # Convenience instances in case you may need them # not used in this test diff --git a/tests/src/python/test_qgspointdisplacementrenderer.py b/tests/src/python/test_qgspointdisplacementrenderer.py index 574f15220719..875051aa834c 100644 --- a/tests/src/python/test_qgspointdisplacementrenderer.py +++ b/tests/src/python/test_qgspointdisplacementrenderer.py @@ -22,36 +22,36 @@ __date__ = 'September 2016' __copyright__ = '(C) 2016, Nyall Dawson' -import qgis # NOQA - import os +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QSize from qgis.PyQt.QtGui import QColor -from qgis.PyQt.QtCore import QSize, QThreadPool, QDir from qgis.PyQt.QtXml import QDomDocument - -from qgis.core import (QgsVectorLayer, - QgsProject, - QgsRectangle, - QgsMultiRenderChecker, - QgsPointDisplacementRenderer, - QgsFontUtils, - QgsUnitTypes, - QgsMapUnitScale, - QgsMarkerSymbol, - QgsCategorizedSymbolRenderer, - QgsRendererCategory, - QgsSingleSymbolRenderer, - QgsPointClusterRenderer, - QgsMapSettings, - QgsProperty, - QgsReadWriteContext, - QgsSymbolLayer, - QgsRenderContext, - QgsFeature, - QgsGeometry - ) +from qgis.core import ( + QgsCategorizedSymbolRenderer, + QgsFeature, + QgsFontUtils, + QgsGeometry, + QgsMapSettings, + QgsMapUnitScale, + QgsMarkerSymbol, + QgsMultiRenderChecker, + QgsPointClusterRenderer, + QgsPointDisplacementRenderer, + QgsProject, + QgsProperty, + QgsReadWriteContext, + QgsRectangle, + QgsRenderContext, + QgsRendererCategory, + QgsSingleSymbolRenderer, + QgsSymbolLayer, + QgsUnitTypes, + QgsVectorLayer, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath # Convenience instances in case you may need them diff --git a/tests/src/python/test_qgspolymorphicrelation.py b/tests/src/python/test_qgspolymorphicrelation.py index ca689b9f4f50..b7b81933c057 100644 --- a/tests/src/python/test_qgspolymorphicrelation.py +++ b/tests/src/python/test_qgspolymorphicrelation.py @@ -11,17 +11,15 @@ import qgis # NOQA -from qgis.core import (QgsVectorLayer, - QgsFeature, - QgsPolymorphicRelation, - QgsGeometry, - QgsPointXY, - QgsAttributeEditorElement, - QgsAttributeEditorRelation, - QgsProject - ) +from qgis.core import ( + QgsFeature, + QgsGeometry, + QgsPointXY, + QgsPolymorphicRelation, + QgsProject, + QgsVectorLayer, +) from qgis.testing import start_app, unittest -import os start_app() diff --git a/tests/src/python/test_qgspostgresdomain.py b/tests/src/python/test_qgspostgresdomain.py index 4f58f9066f3c..098858cc91eb 100644 --- a/tests/src/python/test_qgspostgresdomain.py +++ b/tests/src/python/test_qgspostgresdomain.py @@ -9,12 +9,10 @@ __date__ = '10/02/2018' __copyright__ = 'Copyright 2018, The QGIS Project' -import qgis # NOQA - import os -from qgis.core import QgsVectorLayer, QgsProject - +import qgis # NOQA +from qgis.core import QgsProject, QgsVectorLayer from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgspostgrestransaction.py b/tests/src/python/test_qgspostgrestransaction.py index 53b678d93d74..72611f9c1ce6 100644 --- a/tests/src/python/test_qgspostgrestransaction.py +++ b/tests/src/python/test_qgspostgrestransaction.py @@ -9,18 +9,16 @@ __date__ = '11/06/2018' __copyright__ = 'Copyright 2018, The QGIS Project' -import qgis # NOQA - import os +import qgis # NOQA from qgis.core import ( Qgis, - QgsVectorLayer, + QgsDataSourceUri, QgsProject, QgsTransaction, - QgsDataSourceUri + QgsVectorLayer, ) - from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsprocessexecutable_pt1.py b/tests/src/python/test_qgsprocessexecutable_pt1.py index b6828bdf8bc1..d7fbfc7fd4b1 100644 --- a/tests/src/python/test_qgsprocessexecutable_pt1.py +++ b/tests/src/python/test_qgsprocessexecutable_pt1.py @@ -9,18 +9,17 @@ __date__ = '05/04/2020' __copyright__ = 'Copyright 2020, The QGIS Project' -import sys -import os import glob +import json +import os import re -import time import shutil import subprocess +import sys import tempfile -import json -import errno from qgis.testing import unittest + from utilities import unitTestDataPath print('CTEST_FULL_OUTPUT') diff --git a/tests/src/python/test_qgsprocessexecutable_pt2.py b/tests/src/python/test_qgsprocessexecutable_pt2.py index 9ac6a8fa8dc2..9d17400995f6 100644 --- a/tests/src/python/test_qgsprocessexecutable_pt2.py +++ b/tests/src/python/test_qgsprocessexecutable_pt2.py @@ -9,18 +9,17 @@ __date__ = '05/04/2020' __copyright__ = 'Copyright 2020, The QGIS Project' -import sys -import os import glob +import json +import os import re -import time import shutil import subprocess +import sys import tempfile -import json -import errno from qgis.testing import unittest + from utilities import unitTestDataPath print('CTEST_FULL_OUTPUT') diff --git a/tests/src/python/test_qgsprocessingalgrunner.py b/tests/src/python/test_qgsprocessingalgrunner.py index 8951788eea68..692333c01549 100644 --- a/tests/src/python/test_qgsprocessingalgrunner.py +++ b/tests/src/python/test_qgsprocessingalgrunner.py @@ -9,21 +9,20 @@ __date__ = '2019-02' __copyright__ = 'Copyright 2019, The QGIS Project' -from qgis.PyQt.QtCore import QCoreApplication -from qgis.testing import start_app, unittest - from processing.core.Processing import Processing +from qgis.PyQt.QtCore import QCoreApplication from qgis.analysis import QgsNativeAlgorithms from qgis.core import ( QgsApplication, - QgsSettings, - QgsProcessingContext, - QgsProcessingAlgRunnerTask, QgsProcessingAlgorithm, - QgsProject, + QgsProcessingAlgRunnerTask, + QgsProcessingContext, QgsProcessingFeedback, - QgsTask + QgsProject, + QgsSettings, + QgsTask, ) +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsprocessingbatch.py b/tests/src/python/test_qgsprocessingbatch.py index 768d7e9ab30f..f9eeb1cc75fe 100644 --- a/tests/src/python/test_qgsprocessingbatch.py +++ b/tests/src/python/test_qgsprocessingbatch.py @@ -11,13 +11,7 @@ import qgis # NOQA -from qgis.core import ( - QgsProcessingBatchFeedback, - QgsProcessingFeedback -) - -from qgis.PyQt.QtXml import QDomDocument - +from qgis.core import QgsProcessingBatchFeedback, QgsProcessingFeedback from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsprocessinginplace.py b/tests/src/python/test_qgsprocessinginplace.py index 51a45eca2c34..616ff741a5a2 100644 --- a/tests/src/python/test_qgsprocessinginplace.py +++ b/tests/src/python/test_qgsprocessinginplace.py @@ -9,38 +9,39 @@ __date__ = '2018-09' __copyright__ = 'Copyright 2018, The QGIS Project' -import re import os -from qgis.PyQt.QtCore import QCoreApplication, QVariant, QTemporaryDir +import re +import shutil + +from processing.core.Processing import Processing +from processing.core.ProcessingConfig import ProcessingConfig +from processing.gui.AlgorithmExecutor import execute_in_place_run +from processing.tools import dataobjects +from qgis.PyQt.QtCore import QCoreApplication, QTemporaryDir, QVariant +from qgis.analysis import QgsNativeAlgorithms from qgis.core import ( - QgsFeature, - QgsGeometry, - QgsSettings, QgsApplication, - QgsMemoryProviderUtils, - QgsWkbTypes, + QgsCoordinateReferenceSystem, + QgsFeature, + QgsFeatureRequest, + QgsFeatureSink, QgsField, QgsFields, - QgsProcessingFeatureSourceDefinition, + QgsGeometry, + QgsMemoryProviderUtils, QgsProcessingContext, + QgsProcessingException, QgsProcessingFeedback, - QgsCoordinateReferenceSystem, QgsProject, - QgsProcessingException, + QgsProperty, + QgsSettings, QgsVectorLayer, - QgsFeatureSink, - QgsProperty + QgsVectorLayerUtils, + QgsWkbTypes, ) -from processing.core.Processing import Processing -from processing.core.ProcessingConfig import ProcessingConfig -from processing.tools import dataobjects -from processing.gui.AlgorithmExecutor import execute_in_place_run from qgis.testing import start_app, unittest + from utilities import unitTestDataPath -from qgis.PyQt.QtTest import QSignalSpy -from qgis.analysis import QgsNativeAlgorithms -from qgis.core import QgsVectorLayerUtils, QgsFeatureRequest -import shutil start_app() diff --git a/tests/src/python/test_qgsprocessingparameters.py b/tests/src/python/test_qgsprocessingparameters.py index d1cc50641b6f..1948a30da1f4 100644 --- a/tests/src/python/test_qgsprocessingparameters.py +++ b/tests/src/python/test_qgsprocessingparameters.py @@ -9,16 +9,15 @@ __date__ = '2020-09' __copyright__ = 'Copyright 2020, The QGIS Project' -from qgis.PyQt.QtCore import QCoreApplication - from processing.core.Processing import Processing -from qgis.testing import start_app, unittest +from qgis.PyQt.QtCore import QCoreApplication from qgis.core import ( QgsApplication, - QgsSettings, QgsProcessingParameterGeometry, + QgsSettings, QgsWkbTypes, ) +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsprocessingrecentalgorithmslog.py b/tests/src/python/test_qgsprocessingrecentalgorithmslog.py index 329c486d885a..a70760c24d9c 100644 --- a/tests/src/python/test_qgsprocessingrecentalgorithmslog.py +++ b/tests/src/python/test_qgsprocessingrecentalgorithmslog.py @@ -10,10 +10,10 @@ __copyright__ = 'Copyright 2018, The QGIS Project' from qgis.PyQt.QtCore import QCoreApplication +from qgis.PyQt.QtTest import QSignalSpy from qgis.core import QgsSettings -from qgis.gui import QgsProcessingRecentAlgorithmLog, QgsGui +from qgis.gui import QgsGui, QgsProcessingRecentAlgorithmLog from qgis.testing import start_app, unittest -from qgis.PyQt.QtTest import QSignalSpy start_app() diff --git a/tests/src/python/test_qgsprocessingutils.py b/tests/src/python/test_qgsprocessingutils.py index 1350636556e1..d70efb3876a6 100644 --- a/tests/src/python/test_qgsprocessingutils.py +++ b/tests/src/python/test_qgsprocessingutils.py @@ -11,8 +11,8 @@ __date__ = '7.3.2022' __copyright__ = 'Copyright 2022, The QGIS Project' -from qgis.testing import unittest, start_app -from qgis.core import QgsFields, QgsField, QgsProcessingUtils +from qgis.core import QgsField, QgsFields, QgsProcessingUtils +from qgis.testing import start_app, unittest class TestQgsProcessingUtils(unittest.TestCase): diff --git a/tests/src/python/test_qgsprofilepoint.py b/tests/src/python/test_qgsprofilepoint.py index 800f92fa4b55..fd4a8ea47015 100644 --- a/tests/src/python/test_qgsprofilepoint.py +++ b/tests/src/python/test_qgsprofilepoint.py @@ -9,20 +9,10 @@ __date__ = '18/03/2022' __copyright__ = 'Copyright 2022, The QGIS Project' -import os - import qgis # NOQA -from qgis.PyQt.QtCore import QTemporaryDir - -from qgis.core import ( - QgsProfilePoint -) - -from qgis.PyQt.QtXml import QDomDocument - +from qgis.core import QgsProfilePoint from qgis.testing import start_app, unittest -from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsprofilerequest.py b/tests/src/python/test_qgsprofilerequest.py index bf8580f0d314..211e7564fb0a 100644 --- a/tests/src/python/test_qgsprofilerequest.py +++ b/tests/src/python/test_qgsprofilerequest.py @@ -9,27 +9,19 @@ __date__ = '18/03/2022' __copyright__ = 'Copyright 2022, The QGIS Project' -import os - import qgis # NOQA -from qgis.PyQt.QtCore import QTemporaryDir - from qgis.core import ( - QgsLineString, - QgsProfileRequest, QgsCoordinateReferenceSystem, QgsCoordinateTransformContext, + QgsExpressionContext, + QgsExpressionContextScope, QgsFlatTerrainProvider, + QgsLineString, QgsMeshTerrainProvider, - QgsExpressionContext, - QgsExpressionContextScope + QgsProfileRequest, ) - -from qgis.PyQt.QtXml import QDomDocument - from qgis.testing import start_app, unittest -from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsproject.py b/tests/src/python/test_qgsproject.py index 6ac36ad95144..6b0186b74eb7 100644 --- a/tests/src/python/test_qgsproject.py +++ b/tests/src/python/test_qgsproject.py @@ -10,44 +10,42 @@ __date__ = '19/11/2015' __copyright__ = 'Copyright 2015, The QGIS Project' +import codecs import os import re -from osgeo import ogr -import codecs from io import BytesIO -from zipfile import ZipFile +from shutil import copyfile from tempfile import TemporaryDirectory +from zipfile import ZipFile import qgis # NOQA - -from qgis.core import (Qgis, - QgsProject, - QgsCoordinateTransformContext, - QgsProjectDirtyBlocker, - QgsApplication, - QgsUnitTypes, - QgsCoordinateReferenceSystem, - QgsDataProvider, - QgsLabelingEngineSettings, - QgsVectorLayer, - QgsRasterLayer, - QgsMapLayer, - QgsExpressionContextUtils, - QgsProjectColorScheme, - QgsSettings, - QgsFeature, - QgsGeometry) -from qgis.gui import (QgsLayerTreeMapCanvasBridge, - QgsMapCanvas) - -from qgis.PyQt.QtTest import QSignalSpy -from qgis.PyQt.QtCore import QT_VERSION_STR, QTemporaryDir, QTemporaryFile -from qgis.PyQt.QtGui import QColor +from osgeo import ogr from qgis.PyQt import sip - +from qgis.PyQt.QtCore import QT_VERSION_STR, QTemporaryDir +from qgis.PyQt.QtGui import QColor +from qgis.PyQt.QtTest import QSignalSpy +from qgis.core import ( + Qgis, + QgsApplication, + QgsCoordinateReferenceSystem, + QgsCoordinateTransformContext, + QgsDataProvider, + QgsExpressionContextUtils, + QgsFeature, + QgsGeometry, + QgsLabelingEngineSettings, + QgsMapLayer, + QgsProject, + QgsProjectColorScheme, + QgsProjectDirtyBlocker, + QgsRasterLayer, + QgsSettings, + QgsUnitTypes, + QgsVectorLayer, +) from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath) -from shutil import copyfile + +from utilities import unitTestDataPath app = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsprojectbadlayers.py b/tests/src/python/test_qgsprojectbadlayers.py index 241b57036efa..b2b63e8792e9 100644 --- a/tests/src/python/test_qgsprojectbadlayers.py +++ b/tests/src/python/test_qgsprojectbadlayers.py @@ -9,33 +9,27 @@ __date__ = '20/10/2018' __copyright__ = 'Copyright 2018, The QGIS Project' -import os import filecmp +import os +from shutil import copyfile import qgis # NOQA - -from qgis.core import (QgsProject, - QgsVectorLayer, - QgsCoordinateTransform, - QgsMapSettings, - QgsRasterLayer, - QgsMapLayer, - QgsRectangle, - QgsDataProvider, - QgsReadWriteContext, - QgsCoordinateReferenceSystem, - ) -from qgis.gui import (QgsLayerTreeMapCanvasBridge, - QgsMapCanvas) - -from qgis.PyQt.QtGui import QFont, QColor -from qgis.PyQt.QtTest import QSignalSpy -from qgis.PyQt.QtCore import QT_VERSION_STR, QTemporaryDir, QSize +from qgis.PyQt.QtCore import QSize, QTemporaryDir +from qgis.PyQt.QtGui import QColor from qgis.PyQt.QtXml import QDomDocument, QDomNode - +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsDataProvider, + QgsMapSettings, + QgsProject, + QgsRasterLayer, + QgsReadWriteContext, + QgsRectangle, + QgsVectorLayer, +) from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath, renderMapToImage) -from shutil import copyfile + +from utilities import renderMapToImage, unitTestDataPath app = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsprojectdisplaysettings.py b/tests/src/python/test_qgsprojectdisplaysettings.py index 7acd12f4c8be..6fae729a78e9 100644 --- a/tests/src/python/test_qgsprojectdisplaysettings.py +++ b/tests/src/python/test_qgsprojectdisplaysettings.py @@ -10,23 +10,22 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsProjectDisplaySettings, - QgsReadWriteContext, - QgsBearingNumericFormat, - QgsGeographicCoordinateNumericFormat, - QgsSettings, - QgsLocalDefaultSettings, - QgsUnitTypes, - QgsCoordinateReferenceSystem, - Qgis) - from qgis.PyQt.QtCore import QCoreApplication - from qgis.PyQt.QtTest import QSignalSpy from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + Qgis, + QgsBearingNumericFormat, + QgsCoordinateReferenceSystem, + QgsGeographicCoordinateNumericFormat, + QgsLocalDefaultSettings, + QgsProjectDisplaySettings, + QgsReadWriteContext, + QgsSettings, +) from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath) + +from utilities import unitTestDataPath app = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsprojectelevationproperties.py b/tests/src/python/test_qgsprojectelevationproperties.py index aad2cb0f5dc1..15f1d507a4a2 100644 --- a/tests/src/python/test_qgsprojectelevationproperties.py +++ b/tests/src/python/test_qgsprojectelevationproperties.py @@ -12,22 +12,19 @@ import os import qgis # NOQA - from qgis.PyQt.QtCore import QTemporaryDir - +from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( - QgsProjectElevationProperties, - QgsReadWriteContext, - QgsProject, QgsFlatTerrainProvider, - QgsRasterDemTerrainProvider, QgsMeshTerrainProvider, - QgsRasterLayer + QgsProject, + QgsProjectElevationProperties, + QgsRasterDemTerrainProvider, + QgsRasterLayer, + QgsReadWriteContext, ) - -from qgis.PyQt.QtXml import QDomDocument - from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsprojectgpssettings.py b/tests/src/python/test_qgsprojectgpssettings.py index d414fbef048e..928e35f1f024 100644 --- a/tests/src/python/test_qgsprojectgpssettings.py +++ b/tests/src/python/test_qgsprojectgpssettings.py @@ -9,27 +9,22 @@ __date__ = '03/11/2022' __copyright__ = 'Copyright 2022, The QGIS Project' -import qgis # NOQA import os -from qgis.core import (QgsProjectGpsSettings, - QgsReadWriteContext, - QgsBearingNumericFormat, - QgsGeographicCoordinateNumericFormat, - QgsSettings, - QgsLocalDefaultSettings, - QgsUnitTypes, - QgsCoordinateReferenceSystem, - Qgis, - QgsVectorLayer, - QgsProject) - +import qgis # NOQA from qgis.PyQt.QtCore import QCoreApplication - from qgis.PyQt.QtTest import QSignalSpy from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsProject, + QgsProjectGpsSettings, + QgsReadWriteContext, + QgsSettings, + QgsVectorLayer, +) from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath) + +from utilities import unitTestDataPath app = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsprojectionselectionwidgets.py b/tests/src/python/test_qgsprojectionselectionwidgets.py index 95aafdee7189..02c9bb70c88e 100644 --- a/tests/src/python/test_qgsprojectionselectionwidgets.py +++ b/tests/src/python/test_qgsprojectionselectionwidgets.py @@ -10,16 +10,16 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - from qgis.PyQt.QtTest import QSignalSpy -from qgis.gui import (QgsProjectionSelectionWidget, - QgsProjectionSelectionTreeWidget, - QgsProjectionSelectionDialog) -from qgis.core import QgsCoordinateReferenceSystem, QgsProject, QgsProjUtils from qgis.PyQt.QtWidgets import QComboBox +from qgis.core import QgsCoordinateReferenceSystem, QgsProject +from qgis.gui import ( + QgsProjectionSelectionDialog, + QgsProjectionSelectionTreeWidget, + QgsProjectionSelectionWidget, +) from qgis.testing import start_app, unittest - start_app() diff --git a/tests/src/python/test_qgsprojectmetadata.py b/tests/src/python/test_qgsprojectmetadata.py index 4fd4d2934b43..ad4c7bb1f395 100644 --- a/tests/src/python/test_qgsprojectmetadata.py +++ b/tests/src/python/test_qgsprojectmetadata.py @@ -12,18 +12,16 @@ __copyright__ = 'Copyright 2018, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtCore import QDate, QDateTime, QTime +from qgis.PyQt.QtTest import QSignalSpy from qgis.PyQt.QtXml import QDomDocument - -from qgis.core import (QgsProjectMetadata, - QgsAbstractMetadataBase, - QgsProject, - QgsNativeProjectMetadataValidator) -from qgis.PyQt.QtCore import (QDate, - QTime, - QDateTime) +from qgis.core import ( + QgsAbstractMetadataBase, + QgsNativeProjectMetadataValidator, + QgsProject, + QgsProjectMetadata, +) from qgis.testing import start_app, unittest -from qgis.PyQt.QtTest import QSignalSpy start_app() diff --git a/tests/src/python/test_qgsprojectrelationmanager.py b/tests/src/python/test_qgsprojectrelationmanager.py index 611444353b49..5061b05df8fb 100644 --- a/tests/src/python/test_qgsprojectrelationmanager.py +++ b/tests/src/python/test_qgsprojectrelationmanager.py @@ -10,14 +10,15 @@ __copyright__ = 'Copyright 2019, The QGIS Project' import os -import qgis # NOQA -from qgis.core import (QgsVectorLayer, - QgsRelation, - QgsRelationManager, - QgsProject - ) +import qgis # NOQA +from qgis.core import ( + QgsProject, + QgsRelation, + QgsVectorLayer, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsprojectservervalidator.py b/tests/src/python/test_qgsprojectservervalidator.py index 511be6bd2cf9..622505f1a2e1 100644 --- a/tests/src/python/test_qgsprojectservervalidator.py +++ b/tests/src/python/test_qgsprojectservervalidator.py @@ -12,11 +12,7 @@ __date__ = '27/03/2020' __copyright__ = 'Copyright 2020, The QGIS Project' -from qgis.core import ( - QgsProject, - QgsVectorLayer, - QgsProjectServerValidator, -) +from qgis.core import QgsProject, QgsProjectServerValidator, QgsVectorLayer from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgsprojectstylesettings.py b/tests/src/python/test_qgsprojectstylesettings.py index f70bf7e8e280..4fb7e7ec8963 100644 --- a/tests/src/python/test_qgsprojectstylesettings.py +++ b/tests/src/python/test_qgsprojectstylesettings.py @@ -10,33 +10,32 @@ __copyright__ = 'Copyright 2019, The QGIS Project' import qgis # NOQA -import os - -from qgis.core import (QgsProject, - QgsProjectStyleSettings, - QgsProjectStyleDatabaseModel, - QgsProjectStyleDatabaseProxyModel, - QgsReadWriteContext, - QgsSymbol, - QgsWkbTypes, - QgsStyle, - QgsGradientColorRamp, - QgsTextFormat, - Qgis) - from qgis.PyQt.QtCore import ( - Qt, + QCoreApplication, + QEvent, QModelIndex, + Qt, QTemporaryDir, - QCoreApplication, - QEvent ) -from qgis.PyQt.QtGui import QFont, QColor - +from qgis.PyQt.QtGui import QColor, QFont from qgis.PyQt.QtTest import QSignalSpy -from qgis.PyQt.QtXml import QDomDocument, QDomElement +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + Qgis, + QgsGradientColorRamp, + QgsProject, + QgsProjectStyleDatabaseModel, + QgsProjectStyleDatabaseProxyModel, + QgsProjectStyleSettings, + QgsReadWriteContext, + QgsStyle, + QgsSymbol, + QgsTextFormat, + QgsWkbTypes, +) from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath) + +from utilities import unitTestDataPath try: from qgis.core import QgsCombinedStyleModel diff --git a/tests/src/python/test_qgsprojecttimesettings.py b/tests/src/python/test_qgsprojecttimesettings.py index 88f30a1a497c..d8c2a2be015e 100644 --- a/tests/src/python/test_qgsprojecttimesettings.py +++ b/tests/src/python/test_qgsprojecttimesettings.py @@ -10,21 +10,18 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsProject, - QgsUnitTypes, - QgsProjectTimeSettings, - QgsReadWriteContext, - QgsDateTimeRange) - -from qgis.PyQt.QtCore import (QDate, - QTime, - QDateTime) - +from qgis.PyQt.QtCore import QDate, QDateTime, QTime from qgis.PyQt.QtTest import QSignalSpy -from qgis.PyQt.QtXml import QDomDocument, QDomElement +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsDateTimeRange, + QgsProjectTimeSettings, + QgsReadWriteContext, + QgsUnitTypes, +) from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath) + +from utilities import unitTestDataPath app = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsprojectutils.py b/tests/src/python/test_qgsprojectutils.py index 2044f78d73d6..683fb963d4f5 100644 --- a/tests/src/python/test_qgsprojectutils.py +++ b/tests/src/python/test_qgsprojectutils.py @@ -11,16 +11,16 @@ import qgis # NOQA - from qgis.core import ( - QgsProjectUtils, - QgsGroupLayer, QgsCoordinateTransformContext, - QgsVectorLayer, + QgsGroupLayer, + QgsProject, + QgsProjectUtils, QgsRasterLayer, - QgsProject + QgsVectorLayer, ) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsprojectviewsettings.py b/tests/src/python/test_qgsprojectviewsettings.py index 53036db4f3a4..a9dbeeb40107 100644 --- a/tests/src/python/test_qgsprojectviewsettings.py +++ b/tests/src/python/test_qgsprojectviewsettings.py @@ -9,29 +9,30 @@ __date__ = '30/10/2019' __copyright__ = 'Copyright 2019, The QGIS Project' -import qgis # NOQA import os -from qgis.core import (QgsProject, - QgsProjectViewSettings, - QgsReadWriteContext, - QgsReferencedRectangle, - QgsRectangle, - QgsCoordinateReferenceSystem, - QgsVectorLayer, - QgsFeature, - QgsGeometry, - QgsPointXY, - QgsRasterLayer, - Qgis) -from qgis.gui import QgsMapCanvas - +import qgis # NOQA from qgis.PyQt.QtCore import QTemporaryDir - from qgis.PyQt.QtTest import QSignalSpy -from qgis.PyQt.QtXml import QDomDocument, QDomElement +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + Qgis, + QgsCoordinateReferenceSystem, + QgsFeature, + QgsGeometry, + QgsPointXY, + QgsProject, + QgsProjectViewSettings, + QgsRasterLayer, + QgsReadWriteContext, + QgsRectangle, + QgsReferencedRectangle, + QgsVectorLayer, +) +from qgis.gui import QgsMapCanvas from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath) + +from utilities import unitTestDataPath app = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgspropertyoverridebutton.py b/tests/src/python/test_qgspropertyoverridebutton.py index 50c148861d47..71f2efad39d4 100644 --- a/tests/src/python/test_qgspropertyoverridebutton.py +++ b/tests/src/python/test_qgspropertyoverridebutton.py @@ -10,17 +10,15 @@ __copyright__ = 'Copyright 2019, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsPropertyDefinition, - QgsProperty, - QgsApplication, - QgsProjectColorScheme) - -from qgis.gui import (QgsColorButton, - QgsPropertyOverrideButton) - -from qgis.testing import start_app, unittest from qgis.PyQt.QtGui import QColor +from qgis.core import ( + QgsApplication, + QgsProjectColorScheme, + QgsProperty, + QgsPropertyDefinition, +) +from qgis.gui import QgsColorButton, QgsPropertyOverrideButton +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsproviderconnection_base.py b/tests/src/python/test_qgsproviderconnection_base.py index 4b0e4a1ce3b8..b74a655703fa 100644 --- a/tests/src/python/test_qgsproviderconnection_base.py +++ b/tests/src/python/test_qgsproviderconnection_base.py @@ -18,28 +18,29 @@ import os import time + +from qgis.PyQt import QtCore from qgis.PyQt.QtCore import QCoreApplication, QVariant -from qgis.testing import start_app +from qgis.PyQt.QtTest import QSignalSpy from qgis.core import ( - QgsSettings, - QgsProviderRegistry, - QgsWkbTypes, - QgsVectorLayer, - QgsFields, - QgsCoordinateReferenceSystem, - QgsField, + Qgis, QgsAbstractDatabaseProviderConnection, - QgsProviderConnectionException, + QgsApplication, + QgsCoordinateReferenceSystem, QgsFeature, - QgsGeometry, QgsFeedback, - QgsApplication, - QgsTask, + QgsField, + QgsFields, + QgsGeometry, QgsMapLayerUtils, - Qgis, + QgsProviderConnectionException, + QgsProviderRegistry, + QgsSettings, + QgsTask, + QgsVectorLayer, + QgsWkbTypes, ) -from qgis.PyQt import QtCore -from qgis.PyQt.QtTest import QSignalSpy +from qgis.testing import start_app class TestPyQgsProviderConnectionBase(): diff --git a/tests/src/python/test_qgsproviderconnection_hana.py b/tests/src/python/test_qgsproviderconnection_hana.py index 5904b4c34337..1699cdfb3e37 100644 --- a/tests/src/python/test_qgsproviderconnection_hana.py +++ b/tests/src/python/test_qgsproviderconnection_hana.py @@ -13,13 +13,15 @@ __revision__ = '$Format:%H$' import os + from qgis.core import ( QgsAbstractDatabaseProviderConnection, - QgsDataSourceUri, - QgsProviderRegistry) + QgsProviderRegistry, +) from qgis.testing import unittest -from test_qgsproviderconnection_base import TestPyQgsProviderConnectionBase + from test_hana_utils import QgsHanaProviderUtils +from test_qgsproviderconnection_base import TestPyQgsProviderConnectionBase class TestPyQgsProviderConnectionHana(unittest.TestCase, TestPyQgsProviderConnectionBase): diff --git a/tests/src/python/test_qgsproviderconnection_mssql.py b/tests/src/python/test_qgsproviderconnection_mssql.py index 6f45d09e6392..f4a9bdf6940a 100644 --- a/tests/src/python/test_qgsproviderconnection_mssql.py +++ b/tests/src/python/test_qgsproviderconnection_mssql.py @@ -13,15 +13,16 @@ __revision__ = '$Format:%H$' import os -from test_qgsproviderconnection_base import TestPyQgsProviderConnectionBase + from qgis.core import ( - QgsVectorLayer, - QgsProviderRegistry, QgsDataSourceUri, - QgsAbstractDatabaseProviderConnection, + QgsProviderRegistry, + QgsVectorLayer, ) from qgis.testing import unittest +from test_qgsproviderconnection_base import TestPyQgsProviderConnectionBase + class TestPyQgsProviderConnectionMssql(unittest.TestCase, TestPyQgsProviderConnectionBase): diff --git a/tests/src/python/test_qgsproviderconnection_ogr_gpkg.py b/tests/src/python/test_qgsproviderconnection_ogr_gpkg.py index c35eaa71eab5..83ab03a2146a 100644 --- a/tests/src/python/test_qgsproviderconnection_ogr_gpkg.py +++ b/tests/src/python/test_qgsproviderconnection_ogr_gpkg.py @@ -12,28 +12,28 @@ # This will get replaced with a git SHA1 when you do a git archive __revision__ = '$Format:%H$' -import os import shutil -from osgeo import gdal # NOQA -from test_qgsproviderconnection_base import TestPyQgsProviderConnectionBase +from osgeo import gdal # NOQA from qgis.PyQt.QtCore import QTemporaryDir, QVariant from qgis.core import ( Qgis, - QgsWkbTypes, QgsAbstractDatabaseProviderConnection, + QgsCodedFieldDomain, + QgsCodedValue, + QgsCoordinateReferenceSystem, + QgsFields, + QgsGlobFieldDomain, QgsProviderConnectionException, - QgsVectorLayer, - QgsRasterLayer, QgsProviderRegistry, - QgsFields, - QgsCoordinateReferenceSystem, QgsRangeFieldDomain, - QgsGlobFieldDomain, - QgsCodedFieldDomain, - QgsCodedValue + QgsRasterLayer, + QgsVectorLayer, + QgsWkbTypes, ) from qgis.testing import unittest + +from test_qgsproviderconnection_base import TestPyQgsProviderConnectionBase from utilities import unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsproviderconnection_oracle.py b/tests/src/python/test_qgsproviderconnection_oracle.py index 3a9a66d7d97e..a35be2ea7f50 100644 --- a/tests/src/python/test_qgsproviderconnection_oracle.py +++ b/tests/src/python/test_qgsproviderconnection_oracle.py @@ -13,17 +13,17 @@ __revision__ = '$Format:%H$' import os -from test_qgsproviderconnection_base import TestPyQgsProviderConnectionBase + +from qgis.PyQt.QtSql import QSqlDatabase, QSqlQuery from qgis.core import ( - QgsVectorLayer, - QgsProviderRegistry, - QgsDataSourceUri, QgsAbstractDatabaseProviderConnection, + QgsDataSourceUri, QgsProviderConnectionException, - + QgsProviderRegistry, ) from qgis.testing import unittest -from qgis.PyQt.QtSql import QSqlDatabase, QSqlQuery + +from test_qgsproviderconnection_base import TestPyQgsProviderConnectionBase class TestPyQgsProviderConnectionOracle(unittest.TestCase, TestPyQgsProviderConnectionBase): diff --git a/tests/src/python/test_qgsproviderconnection_postgres.py b/tests/src/python/test_qgsproviderconnection_postgres.py index a4e0c093f3a9..1a85c9c83dd7 100644 --- a/tests/src/python/test_qgsproviderconnection_postgres.py +++ b/tests/src/python/test_qgsproviderconnection_postgres.py @@ -13,23 +13,22 @@ __revision__ = '$Format:%H$' import os -import time -from test_qgsproviderconnection_base import TestPyQgsProviderConnectionBase + +from qgis.PyQt.QtCore import QTemporaryDir from qgis.core import ( Qgis, - QgsWkbTypes, QgsAbstractDatabaseProviderConnection, + QgsDataSourceUri, QgsProviderConnectionException, - QgsVectorLayer, QgsProviderRegistry, - QgsCoordinateReferenceSystem, QgsRasterLayer, - QgsDataSourceUri, QgsSettings, + QgsVectorLayer, + QgsWkbTypes, ) from qgis.testing import unittest -from osgeo import gdal -from qgis.PyQt.QtCore import QTemporaryDir + +from test_qgsproviderconnection_base import TestPyQgsProviderConnectionBase class TestPyQgsProviderConnectionPostgres(unittest.TestCase, TestPyQgsProviderConnectionBase): diff --git a/tests/src/python/test_qgsproviderconnection_spatialite.py b/tests/src/python/test_qgsproviderconnection_spatialite.py index b81d441bf19c..e48730713b51 100644 --- a/tests/src/python/test_qgsproviderconnection_spatialite.py +++ b/tests/src/python/test_qgsproviderconnection_spatialite.py @@ -15,19 +15,20 @@ import os import shutil import tempfile -from test_qgsproviderconnection_base import TestPyQgsProviderConnectionBase + from qgis.core import ( Qgis, - QgsWkbTypes, QgsAbstractDatabaseProviderConnection, + QgsCoordinateReferenceSystem, + QgsFields, QgsProviderConnectionException, - QgsVectorLayer, - QgsRasterLayer, QgsProviderRegistry, - QgsFields, - QgsCoordinateReferenceSystem, + QgsVectorLayer, + QgsWkbTypes, ) from qgis.testing import unittest + +from test_qgsproviderconnection_base import TestPyQgsProviderConnectionBase from utilities import unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsproviderconnectioncombobox.py b/tests/src/python/test_qgsproviderconnectioncombobox.py index de412754cc79..2c2486e5b851 100644 --- a/tests/src/python/test_qgsproviderconnectioncombobox.py +++ b/tests/src/python/test_qgsproviderconnectioncombobox.py @@ -9,22 +9,18 @@ __date__ = '8/03/2020' __copyright__ = 'Copyright 2020, The QGIS Project' -import qgis # NOQA - -import tempfile -import shutil import os +import shutil +import tempfile -from qgis.core import ( - QgsVectorLayer, - QgsProviderRegistry -) -from qgis.gui import QgsProviderConnectionComboBox +import qgis # NOQA from qgis.PyQt.QtCore import QCoreApplication from qgis.PyQt.QtTest import QSignalSpy - +from qgis.core import QgsProviderRegistry, QgsVectorLayer +from qgis.gui import QgsProviderConnectionComboBox from qgis.testing import unittest -from utilities import unitTestDataPath, start_app + +from utilities import start_app, unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsproviderconnectionmodel.py b/tests/src/python/test_qgsproviderconnectionmodel.py index 4fdfbdf5a062..31397491b8d0 100644 --- a/tests/src/python/test_qgsproviderconnectionmodel.py +++ b/tests/src/python/test_qgsproviderconnectionmodel.py @@ -15,18 +15,16 @@ import os import shutil import tempfile + +from qgis.PyQt.QtCore import QCoreApplication, QModelIndex, Qt from qgis.core import ( - QgsVectorLayer, - QgsProviderRegistry, QgsProviderConnectionModel, -) -from qgis.PyQt.QtCore import ( - QModelIndex, - Qt, - QCoreApplication + QgsProviderRegistry, + QgsVectorLayer, ) from qgis.testing import unittest -from utilities import unitTestDataPath, start_app + +from utilities import start_app, unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsproviderguiregistry.py b/tests/src/python/test_qgsproviderguiregistry.py index 3b7d2e468aa2..1abede846300 100644 --- a/tests/src/python/test_qgsproviderguiregistry.py +++ b/tests/src/python/test_qgsproviderguiregistry.py @@ -10,14 +10,10 @@ __copyright__ = 'Copyright 2021, The QGIS Project' import sys -import qgis # NOQA -from qgis.gui import ( - QgsGui, - QgsProviderGuiRegistry -) +import qgis # NOQA +from qgis.gui import QgsGui from qgis.testing import start_app, unittest -from utilities import unitTestDataPath # Convenience instances in case you may need them # to find the srs.db diff --git a/tests/src/python/test_qgsproviderregistry.py b/tests/src/python/test_qgsproviderregistry.py index b14b3ab57ee7..7e31937a1112 100644 --- a/tests/src/python/test_qgsproviderregistry.py +++ b/tests/src/python/test_qgsproviderregistry.py @@ -10,16 +10,16 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - from qgis.core import ( - QgsProviderRegistry, + Qgis, QgsMapLayerType, QgsProviderMetadata, + QgsProviderRegistry, QgsProviderSublayerDetails, - Qgis, - QgsProviderUtils + QgsProviderUtils, ) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath # Convenience instances in case you may need them diff --git a/tests/src/python/test_qgsprovidersublayerdetails.py b/tests/src/python/test_qgsprovidersublayerdetails.py index 548cf16f9cf2..15a431d1e7c5 100644 --- a/tests/src/python/test_qgsprovidersublayerdetails.py +++ b/tests/src/python/test_qgsprovidersublayerdetails.py @@ -9,19 +9,19 @@ __date__ = '16/03/2020' __copyright__ = 'Copyright 2020, The QGIS Project' -import qgis # NOQA import os +import qgis # NOQA from qgis.core import ( - QgsProviderRegistry, - QgsMapLayerType, - QgsWkbTypes, - QgsProviderSublayerDetails, Qgis, QgsCoordinateTransformContext, - QgsVectorLayer + QgsMapLayerType, + QgsProviderSublayerDetails, + QgsVectorLayer, + QgsWkbTypes, ) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath # Convenience instances in case you may need them diff --git a/tests/src/python/test_qgsprovidersublayermodel.py b/tests/src/python/test_qgsprovidersublayermodel.py index 944ca14b876d..a86f373915b7 100644 --- a/tests/src/python/test_qgsprovidersublayermodel.py +++ b/tests/src/python/test_qgsprovidersublayermodel.py @@ -10,18 +10,14 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtCore import QModelIndex, Qt from qgis.core import ( Qgis, QgsMapLayerType, - QgsWkbTypes, QgsProviderSublayerDetails, + QgsProviderSublayerModel, QgsProviderSublayerProxyModel, - QgsProviderSublayerModel -) -from qgis.PyQt.QtCore import ( - Qt, - QModelIndex + QgsWkbTypes, ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsprovidersublayertask.py b/tests/src/python/test_qgsprovidersublayertask.py index 6645297cb4a1..6b6cb74ce89a 100644 --- a/tests/src/python/test_qgsprovidersublayertask.py +++ b/tests/src/python/test_qgsprovidersublayertask.py @@ -9,21 +9,17 @@ __date__ = '30/06/2021' __copyright__ = 'Copyright 2021, The QGIS Project' +from qgis.PyQt.QtTest import QSignalSpy from qgis.core import ( QgsApplication, - QgsProviderSublayerTask, QgsMapLayerType, - QgsWkbTypes + QgsProviderSublayerTask, + QgsWkbTypes, ) +from qgis.testing import start_app, unittest -from qgis.testing import ( - unittest, - start_app -) from utilities import unitTestDataPath -from qgis.PyQt.QtTest import QSignalSpy - app = start_app() diff --git a/tests/src/python/test_qgsproviderutils.py b/tests/src/python/test_qgsproviderutils.py index a5adfce03230..f3bb5207dc8b 100644 --- a/tests/src/python/test_qgsproviderutils.py +++ b/tests/src/python/test_qgsproviderutils.py @@ -11,16 +11,13 @@ from qgis.core import ( Qgis, - QgsWkbTypes, + QgsMapLayerType, QgsProviderRegistry, - QgsProviderUtils, QgsProviderSublayerDetails, - QgsMapLayerType -) -from qgis.testing import ( - unittest, - start_app + QgsProviderUtils, + QgsWkbTypes, ) +from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsqueryresultmodel.py b/tests/src/python/test_qgsqueryresultmodel.py index 33d4a044c667..670fd0592162 100644 --- a/tests/src/python/test_qgsqueryresultmodel.py +++ b/tests/src/python/test_qgsqueryresultmodel.py @@ -13,16 +13,21 @@ __revision__ = '$Format:%H$' import os -from time import sleep + +from qgis.PyQt.QtCore import ( + QCoreApplication, + QModelIndex, + Qt, + QTimer, + QVariant, +) +from qgis.PyQt.QtTest import QAbstractItemModelTester +from qgis.PyQt.QtWidgets import QDialog, QLabel, QListView, QVBoxLayout from qgis.core import ( QgsProviderRegistry, QgsQueryResultModel, - QgsAbstractDatabaseProviderConnection, ) -from qgis.testing import unittest, start_app -from qgis.PyQt.QtCore import QCoreApplication, QVariant, Qt, QTimer, QModelIndex -from qgis.PyQt.QtWidgets import QListView, QDialog, QVBoxLayout, QLabel -from qgis.PyQt.QtTest import QAbstractItemModelTester +from qgis.testing import start_app, unittest class TestPyQgsQgsQueryResultModel(unittest.TestCase): diff --git a/tests/src/python/test_qgsrandommarkersymbollayer.py b/tests/src/python/test_qgsrandommarkersymbollayer.py index d49294285f79..d039ab09ad1d 100644 --- a/tests/src/python/test_qgsrandommarkersymbollayer.py +++ b/tests/src/python/test_qgsrandommarkersymbollayer.py @@ -19,36 +19,35 @@ __date__ = 'October 2019' __copyright__ = '(C) 2019, Nyall Dawson' -import qgis # NOQA - import os -from utilities import unitTestDataPath -from qgis.PyQt.QtCore import QDir, Qt, QSize -from qgis.PyQt.QtGui import QImage, QColor, QPainter +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QSize, Qt +from qgis.PyQt.QtGui import QColor, QImage, QPainter from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsFeature, + QgsFillSymbol, + QgsGeometry, + QgsMapSettings, + QgsMarkerSymbol, + QgsMultiRenderChecker, + QgsProperty, + QgsRandomMarkerFillSymbolLayer, + QgsReadWriteContext, + QgsRectangle, + QgsRenderContext, + QgsSimpleFillSymbolLayer, + QgsSimpleMarkerSymbolLayer, + QgsSingleSymbolRenderer, + QgsSymbol, + QgsSymbolLayer, + QgsSymbolLayerUtils, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest -from qgis.core import (QgsGeometry, - QgsFillSymbol, - QgsRenderContext, - QgsFeature, - QgsMapSettings, - QgsReadWriteContext, - QgsSymbolLayerUtils, - QgsSimpleMarkerSymbolLayer, - QgsSimpleFillSymbolLayer, - QgsMarkerSymbol, - QgsRandomMarkerFillSymbolLayer, - QgsVectorLayer, - QgsSingleSymbolRenderer, - QgsProperty, - QgsSymbolLayer, - QgsRectangle, - QgsMultiRenderChecker, - QgsSymbol - ) - -from qgis.testing import unittest, start_app +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsrange.py b/tests/src/python/test_qgsrange.py index 5514034f2860..661758cc354c 100644 --- a/tests/src/python/test_qgsrange.py +++ b/tests/src/python/test_qgsrange.py @@ -10,12 +10,9 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.testing import unittest -from qgis.core import (QgsIntRange, - QgsDoubleRange, - QgsDateRange) from qgis.PyQt.QtCore import QDate +from qgis.core import QgsDateRange, QgsDoubleRange, QgsIntRange +from qgis.testing import unittest class TestQgsIntRange(unittest.TestCase): diff --git a/tests/src/python/test_qgsrangeslider.py b/tests/src/python/test_qgsrangeslider.py index 7e920f58e859..fa4fd1290b0f 100644 --- a/tests/src/python/test_qgsrangeslider.py +++ b/tests/src/python/test_qgsrangeslider.py @@ -10,13 +10,10 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.gui import QgsRangeSlider - from qgis.PyQt.QtCore import Qt -from qgis.PyQt.QtWidgets import QSlider from qgis.PyQt.QtTest import QSignalSpy - +from qgis.PyQt.QtWidgets import QSlider +from qgis.gui import QgsRangeSlider from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsrangewidgets.py b/tests/src/python/test_qgsrangewidgets.py index 3dc34ce2a7d0..3945011c8bc7 100644 --- a/tests/src/python/test_qgsrangewidgets.py +++ b/tests/src/python/test_qgsrangewidgets.py @@ -11,7 +11,7 @@ import qgis # NOQA -from qgis.core import QgsFeature, QgsGeometry, QgsPointXY, QgsVectorLayer, NULL +from qgis.core import NULL, QgsFeature, QgsGeometry, QgsPointXY, QgsVectorLayer from qgis.gui import QgsGui from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsrasterattributetable.py b/tests/src/python/test_qgsrasterattributetable.py index 8c9b55af86d2..708a8d37b389 100644 --- a/tests/src/python/test_qgsrasterattributetable.py +++ b/tests/src/python/test_qgsrasterattributetable.py @@ -13,32 +13,28 @@ __date__ = '20/08/2022' __copyright__ = 'Copyright 2022, The QGIS Project' -import qgis # NOQA - -from osgeo import gdal -from osgeo import osr -import numpy as np -import shutil - import os +import shutil +import numpy as np +import qgis # NOQA +from osgeo import gdal, osr from qgis.PyQt.QtCore import QTemporaryDir, QVariant from qgis.PyQt.QtGui import QColor - - -from qgis.core import (Qgis, - QgsProject, - QgsRasterLayer, - QgsRasterAttributeTable, - QgsPalettedRasterRenderer, - QgsSingleBandPseudoColorRenderer, - QgsPresetSchemeColorRamp, - ) - +from qgis.core import ( + Qgis, + QgsPalettedRasterRenderer, + QgsPresetSchemeColorRamp, + QgsProject, + QgsRasterAttributeTable, + QgsRasterLayer, + QgsSingleBandPseudoColorRenderer, +) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath from qgis.testing.mocked import get_iface +from utilities import unitTestDataPath + # Convenience instances in case you may need them # not used in this test start_app() diff --git a/tests/src/python/test_qgsrasterattributetablemodel.py b/tests/src/python/test_qgsrasterattributetablemodel.py index cc4854abfa20..39d779e70d13 100644 --- a/tests/src/python/test_qgsrasterattributetablemodel.py +++ b/tests/src/python/test_qgsrasterattributetablemodel.py @@ -14,22 +14,15 @@ __copyright__ = 'Copyright 2022, The QGIS Project' import qgis # NOQA - -import os -from qgis.PyQt.QtCore import QVariant, QModelIndex +from qgis.PyQt.Qt import Qt +from qgis.PyQt.QtCore import QModelIndex, QVariant from qgis.PyQt.QtGui import QColor -from qgis.PyQt.Qt import Qt, PYQT_VERSION_STR - -from qgis.core import (Qgis, - QgsRasterAttributeTable, - ) -from qgis.gui import (QgsRasterAttributeTableModel,) - +from qgis.PyQt.QtTest import QAbstractItemModelTester +from qgis.core import Qgis, QgsRasterAttributeTable +from qgis.gui import QgsRasterAttributeTableModel from qgis.testing import start_app, unittest from qgis.testing.mocked import get_iface -from qgis.PyQt.QtTest import QAbstractItemModelTester - # Convenience instances in case you may need them # not used in this test start_app() diff --git a/tests/src/python/test_qgsrasterattributetablewidget.py b/tests/src/python/test_qgsrasterattributetablewidget.py index fe4bbac764f5..bf9d84e0e9c5 100644 --- a/tests/src/python/test_qgsrasterattributetablewidget.py +++ b/tests/src/python/test_qgsrasterattributetablewidget.py @@ -14,34 +14,19 @@ __copyright__ = 'Copyright 2022, The QGIS Project' import qgis # NOQA - -from osgeo import gdal -from osgeo import osr -import numpy as np - -import os - from qgis.PyQt.QtCore import QTemporaryDir, QVariant -from qgis.PyQt.QtGui import QColor from qgis.PyQt.QtWidgets import QDialog, QVBoxLayout - - -from qgis.core import (Qgis, - QgsRasterLayer, - QgsRasterAttributeTable, - QgsPalettedRasterRenderer, - QgsSingleBandPseudoColorRenderer, - QgsPresetSchemeColorRamp, - ) - -from qgis.gui import (QgsRasterAttributeTableWidget, - ) - -from test_qgsrasterattributetable import createTestRasters - +from qgis.core import ( + Qgis, + QgsRasterAttributeTable, + QgsRasterLayer, +) +from qgis.gui import QgsRasterAttributeTableWidget from qgis.testing import start_app, unittest from qgis.testing.mocked import get_iface +from test_qgsrasterattributetable import createTestRasters + # Convenience instances in case you may need them # not used in this test start_app() diff --git a/tests/src/python/test_qgsrasterbandcombobox.py b/tests/src/python/test_qgsrasterbandcombobox.py index d9bc095516b3..d311bfacec9d 100644 --- a/tests/src/python/test_qgsrasterbandcombobox.py +++ b/tests/src/python/test_qgsrasterbandcombobox.py @@ -9,14 +9,15 @@ __date__ = '09/05/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA import os +import qgis # NOQA +from qgis.PyQt.QtCore import QFileInfo +from qgis.PyQt.QtTest import QSignalSpy from qgis.core import QgsRasterLayer from qgis.gui import QgsRasterBandComboBox from qgis.testing import start_app, unittest -from qgis.PyQt.QtCore import QFileInfo -from qgis.PyQt.QtTest import QSignalSpy + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsrastercolorrampshader.py b/tests/src/python/test_qgsrastercolorrampshader.py index f248bb9b1960..bd7499177463 100644 --- a/tests/src/python/test_qgsrastercolorrampshader.py +++ b/tests/src/python/test_qgsrastercolorrampshader.py @@ -11,11 +11,8 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - - from qgis.PyQt.QtGui import QColor - -from qgis.core import (QgsColorRampShader, QgsGradientColorRamp, QgsGradientStop) +from qgis.core import QgsColorRampShader, QgsGradientColorRamp, QgsGradientStop from qgis.testing import unittest diff --git a/tests/src/python/test_qgsrasterfilewriter.py b/tests/src/python/test_qgsrasterfilewriter.py index 5900cf7080c2..e1a2a4a40544 100644 --- a/tests/src/python/test_qgsrasterfilewriter.py +++ b/tests/src/python/test_qgsrasterfilewriter.py @@ -9,24 +9,25 @@ __date__ = '20/08/2012' __copyright__ = 'Copyright 2012, The QGIS Project' -import qgis # NOQA - -import os import glob +import os import tempfile +import qgis # NOQA from osgeo import gdal -from qgis.PyQt.QtCore import QTemporaryFile, QDir -from qgis.core import (QgsContrastEnhancement, - QgsRaster, - QgsRasterLayer, - QgsRasterChecker, - QgsRasterPipe, - QgsRasterFileWriter, - QgsRasterProjector, - QgsRectangle) - +from qgis.PyQt.QtCore import QDir, QTemporaryFile +from qgis.core import ( + QgsContrastEnhancement, + QgsRaster, + QgsRasterChecker, + QgsRasterFileWriter, + QgsRasterLayer, + QgsRasterPipe, + QgsRasterProjector, + QgsRectangle, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsrasterfilewritertask.py b/tests/src/python/test_qgsrasterfilewritertask.py index ffdac037162f..56950b492960 100644 --- a/tests/src/python/test_qgsrasterfilewritertask.py +++ b/tests/src/python/test_qgsrasterfilewritertask.py @@ -9,19 +9,20 @@ __date__ = '12/02/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA import os +import qgis # NOQA +from qgis.PyQt.QtCore import QCoreApplication, QDir from qgis.core import ( QgsApplication, QgsCoordinateTransformContext, + QgsRasterFileWriter, + QgsRasterFileWriterTask, QgsRasterLayer, QgsRasterPipe, - QgsRasterFileWriter, - QgsRasterFileWriterTask ) -from qgis.PyQt.QtCore import QCoreApplication, QDir from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsrasterlayer.py b/tests/src/python/test_qgsrasterlayer.py index dd36b916acd3..489e9c5c3ccc 100644 --- a/tests/src/python/test_qgsrasterlayer.py +++ b/tests/src/python/test_qgsrasterlayer.py @@ -13,60 +13,54 @@ __date__ = '20/08/2012' __copyright__ = 'Copyright 2012, The QGIS Project' -import qgis # NOQA - -from osgeo import gdal -import os import filecmp +import os from shutil import copyfile -import numpy as np -from qgis.PyQt.QtCore import QSize, QFileInfo, Qt, QTemporaryDir - -from qgis.PyQt.QtGui import ( - QColor, - QImage, - QPainter, - QResizeEvent -) +import numpy as np +import qgis # NOQA +from osgeo import gdal +from qgis.PyQt.QtCore import QFileInfo, QSize, QTemporaryDir +from qgis.PyQt.QtGui import QColor, QResizeEvent from qgis.PyQt.QtXml import QDomDocument - -from qgis.core import (Qgis, - QgsMapLayerServerProperties, - QgsRaster, - QgsRasterLayer, - QgsReadWriteContext, - QgsColorRampShader, - QgsContrastEnhancement, - QgsDataProvider, - QgsProject, - QgsMapSettings, - QgsPointXY, - QgsRasterMinMaxOrigin, - QgsRasterShader, - QgsRasterTransparency, - QgsRenderChecker, - QgsPalettedRasterRenderer, - QgsSingleBandGrayRenderer, - QgsSingleBandPseudoColorRenderer, - QgsLimitedRandomColorRamp, - QgsGradientColorRamp, - QgsHueSaturationFilter, - QgsCoordinateTransformContext, - QgsCoordinateReferenceSystem, - QgsRasterHistogram, - QgsCubicRasterResampler, - QgsBilinearRasterResampler, - QgsLayerDefinition, - QgsRasterPipe, - QgsProperty, - QgsExpressionContext, - QgsExpressionContextScope - ) -from utilities import unitTestDataPath +from qgis.core import ( + Qgis, + QgsBilinearRasterResampler, + QgsColorRampShader, + QgsContrastEnhancement, + QgsCoordinateReferenceSystem, + QgsCoordinateTransformContext, + QgsCubicRasterResampler, + QgsDataProvider, + QgsExpressionContext, + QgsExpressionContextScope, + QgsGradientColorRamp, + QgsHueSaturationFilter, + QgsLayerDefinition, + QgsLimitedRandomColorRamp, + QgsMapLayerServerProperties, + QgsMapSettings, + QgsPalettedRasterRenderer, + QgsPointXY, + QgsProject, + QgsProperty, + QgsRaster, + QgsRasterHistogram, + QgsRasterLayer, + QgsRasterMinMaxOrigin, + QgsRasterPipe, + QgsRasterShader, + QgsRasterTransparency, + QgsReadWriteContext, + QgsRenderChecker, + QgsSingleBandGrayRenderer, + QgsSingleBandPseudoColorRenderer, +) from qgis.testing import start_app, unittest from qgis.testing.mocked import get_iface +from utilities import unitTestDataPath + # Convenience instances in case you may need them # not used in this test start_app() diff --git a/tests/src/python/test_qgsrasterlayerelevationproperties.py b/tests/src/python/test_qgsrasterlayerelevationproperties.py index a1055f1f798f..2e9806a4aefa 100644 --- a/tests/src/python/test_qgsrasterlayerelevationproperties.py +++ b/tests/src/python/test_qgsrasterlayerelevationproperties.py @@ -10,17 +10,14 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( + Qgis, + QgsFillSymbol, + QgsLineSymbol, QgsRasterLayerElevationProperties, QgsReadWriteContext, - QgsLineSymbol, - QgsFillSymbol, - Qgis ) - -from qgis.PyQt.QtXml import QDomDocument - from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsrasterlayerprofilegenerator.py b/tests/src/python/test_qgsrasterlayerprofilegenerator.py index 6555837dc64e..1e797c17152c 100644 --- a/tests/src/python/test_qgsrasterlayerprofilegenerator.py +++ b/tests/src/python/test_qgsrasterlayerprofilegenerator.py @@ -12,25 +12,17 @@ import os import qgis # NOQA - -from qgis.PyQt.QtCore import QTemporaryDir - from qgis.core import ( - QgsRasterLayer, - QgsLineString, - QgsProfileRequest, QgsCoordinateReferenceSystem, - QgsCoordinateTransformContext, - QgsFlatTerrainProvider, - QgsMeshTerrainProvider, + QgsLineString, + QgsProfileIdentifyContext, QgsProfilePoint, + QgsProfileRequest, QgsProfileSnapContext, - QgsProfileIdentifyContext + QgsRasterLayer, ) - -from qgis.PyQt.QtXml import QDomDocument - from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsrasterlayerproperties.py b/tests/src/python/test_qgsrasterlayerproperties.py index 500e163de313..fffe13648ef0 100644 --- a/tests/src/python/test_qgsrasterlayerproperties.py +++ b/tests/src/python/test_qgsrasterlayerproperties.py @@ -10,16 +10,23 @@ __date__ = '14/01/2022' __copyright__ = 'Copyright 2022, The QGIS Project' -import qgis # NOQA import pathlib import typing -from qgis.PyQt.QtWidgets import QWidget + +import qgis # NOQA from qgis.PyQt.QtGui import QIcon -from qgis.gui import QgsMapCanvas, QgsMapLayerConfigWidgetFactory, QgsMapLayerConfigWidget, QgsRasterLayerProperties +from qgis.PyQt.QtWidgets import QWidget from qgis.core import QgsMapLayer, QgsProject, QgsRasterLayer -from utilities import unitTestDataPath +from qgis.gui import ( + QgsMapCanvas, + QgsMapLayerConfigWidget, + QgsMapLayerConfigWidgetFactory, + QgsRasterLayerProperties, +) from qgis.testing import start_app, unittest +from utilities import unitTestDataPath + # Convenience instances in case you may need them # not used in this test start_app() diff --git a/tests/src/python/test_qgsrasterlayerrenderer.py b/tests/src/python/test_qgsrasterlayerrenderer.py index ccf966b83560..cd0a606462ab 100644 --- a/tests/src/python/test_qgsrasterlayerrenderer.py +++ b/tests/src/python/test_qgsrasterlayerrenderer.py @@ -9,24 +9,22 @@ __date__ = '2020-06' __copyright__ = 'Copyright 2020, The QGIS Project' -import qgis # NOQA - import os -from qgis.PyQt.QtCore import QSize, QDir - -from qgis.core import (QgsRasterLayer, - QgsMapClippingRegion, - QgsRectangle, - QgsMultiRenderChecker, - QgsGeometry, - QgsSingleSymbolRenderer, - QgsMapSettings, - QgsFillSymbol, - QgsCoordinateReferenceSystem - ) +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QSize +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsGeometry, + QgsMapClippingRegion, + QgsMapSettings, + QgsMultiRenderChecker, + QgsRasterLayer, + QgsRectangle, +) from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath) + +from utilities import unitTestDataPath # Convenience instances in case you may need them # not used in this test diff --git a/tests/src/python/test_qgsrasterlinesymbollayer.py b/tests/src/python/test_qgsrasterlinesymbollayer.py index 69822ad59b05..a532b8e45f7e 100644 --- a/tests/src/python/test_qgsrasterlinesymbollayer.py +++ b/tests/src/python/test_qgsrasterlinesymbollayer.py @@ -20,45 +20,21 @@ __copyright__ = '(C) 2019, Nyall Dawson' import qgis # NOQA +from qgis.PyQt.QtCore import QDir, Qt +from qgis.PyQt.QtGui import QColor, QImage, QPainter +from qgis.core import ( + QgsFeature, + QgsGeometry, + QgsLineSymbol, + QgsMapSettings, + QgsRasterLineSymbolLayer, + QgsRenderChecker, + QgsRenderContext, +) +from qgis.testing import start_app, unittest -import os from utilities import unitTestDataPath -from qgis.PyQt.QtCore import QDir, Qt, QSize -from qgis.PyQt.QtGui import QImage, QColor, QPainter -from qgis.PyQt.QtXml import QDomDocument - -from qgis.core import (QgsGeometry, - QgsFillSymbol, - QgsRenderContext, - QgsFeature, - QgsMapSettings, - QgsRenderChecker, - QgsReadWriteContext, - QgsSymbolLayerUtils, - QgsSimpleMarkerSymbolLayer, - QgsLineSymbolLayer, - QgsMarkerLineSymbolLayer, - QgsMarkerSymbol, - QgsGeometryGeneratorSymbolLayer, - QgsSymbol, - QgsFontMarkerSymbolLayer, - QgsMultiRenderChecker, - QgsLineSymbol, - QgsSymbolLayer, - QgsProperty, - QgsRectangle, - QgsUnitTypes, - QgsSimpleLineSymbolLayer, - QgsTemplatedLineSymbolLayerBase, - QgsHashedLineSymbolLayer, - QgsVectorLayer, - QgsSingleSymbolRenderer, - QgsRasterLineSymbolLayer - ) - -from qgis.testing import unittest, start_app - start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsrasterpipe.py b/tests/src/python/test_qgsrasterpipe.py index d7894820c900..b13a839a06fe 100644 --- a/tests/src/python/test_qgsrasterpipe.py +++ b/tests/src/python/test_qgsrasterpipe.py @@ -23,11 +23,12 @@ __copyright__ = '(C) 2021, Nyall Dawson' import qgis # NOQA -from qgis.core import (QgsRasterPipe, - QgsProperty, - QgsExpressionContext, - QgsSingleBandPseudoColorRenderer - ) +from qgis.core import ( + QgsExpressionContext, + QgsProperty, + QgsRasterPipe, + QgsSingleBandPseudoColorRenderer, +) from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsrasterrange.py b/tests/src/python/test_qgsrasterrange.py index 2a6d7ced9a36..45a7fe1a5096 100644 --- a/tests/src/python/test_qgsrasterrange.py +++ b/tests/src/python/test_qgsrasterrange.py @@ -12,7 +12,6 @@ import qgis # NOQA switch sip api from qgis.core import QgsRasterRange - from qgis.testing import unittest diff --git a/tests/src/python/test_qgsrasterrendererutils.py b/tests/src/python/test_qgsrasterrendererutils.py index c6e12b0549bd..817b88f96362 100644 --- a/tests/src/python/test_qgsrasterrendererutils.py +++ b/tests/src/python/test_qgsrasterrendererutils.py @@ -10,14 +10,11 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - from qgis.PyQt.QtCore import QTemporaryDir -from qgis.PyQt.QtGui import (QColor) -from qgis.core import (QgsRasterRendererUtils, - QgsColorRampShader - ) - +from qgis.PyQt.QtGui import QColor +from qgis.core import QgsColorRampShader, QgsRasterRendererUtils from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsrasterrerderer_createsld.py b/tests/src/python/test_qgsrasterrerderer_createsld.py index a72869530b1d..f5e3ddf422a4 100644 --- a/tests/src/python/test_qgsrasterrerderer_createsld.py +++ b/tests/src/python/test_qgsrasterrerderer_createsld.py @@ -19,38 +19,30 @@ __date__ = 'December 2018' __copyright__ = '(C) 2018, Luigi Pirelli' -import qgis # NOQA - import os import random +import qgis # NOQA from qgis.PyQt.QtCore import ( - Qt, - QDir, - QFile, - QIODevice, - QPointF, - QSizeF, QFileInfo, ) +from qgis.PyQt.QtGui import QColor from qgis.PyQt.QtXml import QDomDocument -from qgis.PyQt.QtGui import QColor, QFont - from qgis.core import ( - QgsRasterLayer, - QgsRasterRenderer, + QgsColorRampShader, + QgsContrastEnhancement, QgsMultiBandColorRenderer, - QgsSingleBandGrayRenderer, QgsPalettedRasterRenderer, - QgsSingleBandPseudoColorRenderer, - QgsContrastEnhancement, - QgsRasterMinMaxOrigin, - Qgis, QgsRasterBandStats, + QgsRasterLayer, + QgsRasterMinMaxOrigin, + QgsRasterRenderer, QgsRasterShader, - QgsColorRampShader, + QgsSingleBandGrayRenderer, + QgsSingleBandPseudoColorRenderer, ) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath # Convenience instances in case you may need them diff --git a/tests/src/python/test_qgsrasterresampler.py b/tests/src/python/test_qgsrasterresampler.py index 01ed9d8d8881..359ba134be3f 100644 --- a/tests/src/python/test_qgsrasterresampler.py +++ b/tests/src/python/test_qgsrasterresampler.py @@ -10,28 +10,27 @@ __date__ = '14/11/2019' __copyright__ = 'Copyright 2019, The QGIS Project' -from osgeo import gdal +import os +import shutil import struct -from contextlib import contextmanager import tempfile +from contextlib import contextmanager import qgis # NOQA - -import os -import shutil - +from osgeo import gdal from qgis.PyQt.QtGui import qRed +from qgis.core import ( + QgsBilinearRasterResampler, + QgsCubicRasterResampler, + QgsRasterDataProvider, + QgsRasterLayer, + QgsRasterResampleFilter, + QgsRectangle, + QgsSingleBandGrayRenderer, +) +from qgis.testing import start_app, unittest -from qgis.core import (QgsRasterLayer, - QgsRectangle, - QgsRasterResampleFilter, - QgsSingleBandGrayRenderer, - QgsCubicRasterResampler, - QgsBilinearRasterResampler, - QgsRasterDataProvider - ) from utilities import unitTestDataPath -from qgis.testing import start_app, unittest # Convenience instances in case you may need them # not used in this test diff --git a/tests/src/python/test_qgsrastertransparencywidget.py b/tests/src/python/test_qgsrastertransparencywidget.py index 1813c1d96677..d4974bfa38bf 100644 --- a/tests/src/python/test_qgsrastertransparencywidget.py +++ b/tests/src/python/test_qgsrastertransparencywidget.py @@ -9,12 +9,11 @@ __date__ = '07/06/2018' __copyright__ = 'Copyright 2018, The QGIS Project' -import qgis # NOQA switch sip api - import pathlib -from qgis.gui import QgsRasterTransparencyWidget, QgsMapCanvas -from qgis.core import QgsRasterLayer, QgsRasterRange +import qgis # NOQA switch sip api +from qgis.core import QgsRasterLayer, QgsRasterRange +from qgis.gui import QgsMapCanvas, QgsRasterTransparencyWidget from qgis.testing import TestCase, unittest from qgis.testing.mocked import get_iface diff --git a/tests/src/python/test_qgsratiolockbutton.py b/tests/src/python/test_qgsratiolockbutton.py index a91e7bf1b0cd..9530ac4318ef 100644 --- a/tests/src/python/test_qgsratiolockbutton.py +++ b/tests/src/python/test_qgsratiolockbutton.py @@ -11,10 +11,7 @@ import qgis # NOQA -from qgis.gui import QgsRatioLockButton - from qgis.PyQt.QtWidgets import QDoubleSpinBox - from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsreadwritecontext.py b/tests/src/python/test_qgsreadwritecontext.py index 042c444cc0fc..1dfc685faaf3 100644 --- a/tests/src/python/test_qgsreadwritecontext.py +++ b/tests/src/python/test_qgsreadwritecontext.py @@ -12,7 +12,6 @@ import qgis # NOQA - from qgis.core import Qgis, QgsReadWriteContext from qgis.testing import unittest diff --git a/tests/src/python/test_qgsrectangle.py b/tests/src/python/test_qgsrectangle.py index f1c4a07adcd8..98d894d875cf 100644 --- a/tests/src/python/test_qgsrectangle.py +++ b/tests/src/python/test_qgsrectangle.py @@ -10,10 +10,9 @@ __copyright__ = 'Copyright 2012, The QGIS Project' import qgis # NOQA - -from qgis.core import QgsRectangle, QgsPointXY, QgsVector - +from qgis.core import QgsPointXY, QgsRectangle, QgsVector from qgis.testing import start_app, unittest + from utilities import compareWkt start_app() diff --git a/tests/src/python/test_qgsreferencedgeometry.py b/tests/src/python/test_qgsreferencedgeometry.py index f34082abbdfe..a90f7f3b1d5c 100644 --- a/tests/src/python/test_qgsreferencedgeometry.py +++ b/tests/src/python/test_qgsreferencedgeometry.py @@ -10,15 +10,15 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsRectangle, - QgsPointXY, - QgsReferencedRectangle, - QgsReferencedPointXY, - QgsCoordinateReferenceSystem) from qgis.PyQt.QtCore import QVariant +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsPointXY, + QgsRectangle, + QgsReferencedPointXY, + QgsReferencedRectangle, +) from qgis.testing import start_app, unittest -from utilities import compareWkt start_app() diff --git a/tests/src/python/test_qgsrelation.py b/tests/src/python/test_qgsrelation.py index 79fcb76dc8ed..d2ae25e87581 100644 --- a/tests/src/python/test_qgsrelation.py +++ b/tests/src/python/test_qgsrelation.py @@ -9,20 +9,21 @@ __date__ = '07/10/2013' __copyright__ = 'Copyright 2013, The QGIS Project' +import os + import qgis # NOQA +from qgis.core import ( + QgsAttributeEditorElement, + QgsFeature, + QgsGeometry, + QgsPointXY, + QgsProject, + QgsRelation, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest -from qgis.core import (QgsVectorLayer, - QgsFeature, - QgsRelation, - QgsGeometry, - QgsPointXY, - QgsAttributeEditorElement, - QgsAttributeEditorRelation, - QgsProject - ) from utilities import unitTestDataPath -from qgis.testing import start_app, unittest -import os start_app() diff --git a/tests/src/python/test_qgsrelationeditorwidgetregistry.py b/tests/src/python/test_qgsrelationeditorwidgetregistry.py index 0b18f52d0fea..b29d3d8a949d 100644 --- a/tests/src/python/test_qgsrelationeditorwidgetregistry.py +++ b/tests/src/python/test_qgsrelationeditorwidgetregistry.py @@ -10,35 +10,19 @@ __copyright__ = 'Copyright 2015, The QGIS Project' import qgis # NOQA - -import os - -from qgis.core import ( - QgsRelation, - QgsVectorLayerTools, +from qgis.PyQt.QtWidgets import ( + QCheckBox, + QGridLayout, + QLabel, ) - +from qgis.core import QgsRelation from qgis.gui import ( - QgsGui, - QgsAbstractRelationEditorWidget, QgsAbstractRelationEditorConfigWidget, + QgsAbstractRelationEditorWidget, QgsAbstractRelationEditorWidgetFactory, - QgsRelationEditorWidget, + QgsGui, QgsRelationEditorConfigWidget, - QgsAttributeEditorContext, - QgsAdvancedDigitizingDockWidget -) - -from qgis.PyQt.QtCore import QTimer -from qgis.PyQt.QtWidgets import ( - QToolButton, - QMessageBox, - QDialogButtonBox, - QTableView, - QDialog, - QLabel, - QGridLayout, - QCheckBox, + QgsRelationEditorWidget, ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsrelationeditwidget.py b/tests/src/python/test_qgsrelationeditwidget.py index c60a30b01cc8..91bb28eb9ea1 100644 --- a/tests/src/python/test_qgsrelationeditwidget.py +++ b/tests/src/python/test_qgsrelationeditwidget.py @@ -9,36 +9,33 @@ __date__ = '28/11/2015' __copyright__ = 'Copyright 2015, The QGIS Project' -import qgis # NOQA - import os +import qgis # NOQA +from qgis.PyQt.QtCore import QTimer +from qgis.PyQt.QtWidgets import ( + QDialog, + QDialogButtonBox, + QMessageBox, + QTableView, + QToolButton, +) from qgis.core import ( QgsFeature, - QgsVectorLayer, + QgsFeatureRequest, + QgsGeometry, QgsProject, QgsRelation, QgsTransaction, - QgsFeatureRequest, + QgsVectorLayer, QgsVectorLayerTools, - QgsGeometry ) - from qgis.gui import ( - QgsGui, - QgsRelationWidgetWrapper, + QgsAdvancedDigitizingDockWidget, QgsAttributeEditorContext, + QgsGui, QgsMapCanvas, - QgsAdvancedDigitizingDockWidget -) - -from qgis.PyQt.QtCore import QTimer -from qgis.PyQt.QtWidgets import ( - QToolButton, - QMessageBox, - QDialogButtonBox, - QTableView, - QDialog + QgsRelationWidgetWrapper, ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsrelationmanager.py b/tests/src/python/test_qgsrelationmanager.py index 446aec2fbbe5..1ac9ceb07b79 100644 --- a/tests/src/python/test_qgsrelationmanager.py +++ b/tests/src/python/test_qgsrelationmanager.py @@ -11,12 +11,13 @@ import qgis # NOQA -from qgis.core import (QgsVectorLayer, - QgsRelation, - QgsPolymorphicRelation, - QgsRelationManager, - QgsProject - ) +from qgis.core import ( + QgsPolymorphicRelation, + QgsProject, + QgsRelation, + QgsRelationManager, + QgsVectorLayer, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsrelationpostgres.py b/tests/src/python/test_qgsrelationpostgres.py index 4b8df4e31cf4..7bdc817b94cd 100644 --- a/tests/src/python/test_qgsrelationpostgres.py +++ b/tests/src/python/test_qgsrelationpostgres.py @@ -9,18 +9,10 @@ __date__ = '27/07/2020' __copyright__ = 'Copyright 2020, The QGIS Project' -import qgis # NOQA - import os -from qgis.core import ( - QgsVectorLayer, - QgsProject, - QgsRelationManager -) -from qgis.gui import ( - QgsMapCanvas -) +import qgis # NOQA +from qgis.core import QgsProject, QgsVectorLayer from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsrendercontext.py b/tests/src/python/test_qgsrendercontext.py index 9d345228a1c7..6a09bdc175fe 100644 --- a/tests/src/python/test_qgsrendercontext.py +++ b/tests/src/python/test_qgsrendercontext.py @@ -10,27 +10,27 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsRenderContext, - QgsMapSettings, - QgsDistanceArea, - QgsPointXY, - QgsCoordinateReferenceSystem, - QgsMapUnitScale, - QgsUnitTypes, - QgsProject, - QgsRectangle, - QgsVectorSimplifyMethod, - QgsRenderedFeatureHandlerInterface, - QgsDateTimeRange, - QgsMapClippingRegion, - QgsGeometry, - QgsDoubleRange, - Qgis) -from qgis.PyQt.QtCore import QSize, QDateTime -from qgis.PyQt.QtGui import QPainter, QImage +from qgis.PyQt.QtCore import QDateTime, QSize +from qgis.PyQt.QtGui import QImage, QPainter +from qgis.core import ( + Qgis, + QgsCoordinateReferenceSystem, + QgsDateTimeRange, + QgsDistanceArea, + QgsDoubleRange, + QgsGeometry, + QgsMapClippingRegion, + QgsMapSettings, + QgsMapUnitScale, + QgsPointXY, + QgsProject, + QgsRectangle, + QgsRenderContext, + QgsRenderedFeatureHandlerInterface, + QgsUnitTypes, + QgsVectorSimplifyMethod, +) from qgis.testing import start_app, unittest -import math # Convenience instances in case you may need them # to find the srs.db diff --git a/tests/src/python/test_qgsrendereditemresults.py b/tests/src/python/test_qgsrendereditemresults.py index c7c1365a02b6..4b590ae9a070 100644 --- a/tests/src/python/test_qgsrendereditemresults.py +++ b/tests/src/python/test_qgsrendereditemresults.py @@ -13,11 +13,11 @@ import qgis # NOQA from qgis.core import ( + QgsRectangle, + QgsRenderContext, + QgsRenderedAnnotationItemDetails, QgsRenderedItemDetails, QgsRenderedItemResults, - QgsRenderedAnnotationItemDetails, - QgsRectangle, - QgsRenderContext ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsrenderer.py b/tests/src/python/test_qgsrenderer.py index d3ba71a0f785..480c079df6cc 100644 --- a/tests/src/python/test_qgsrenderer.py +++ b/tests/src/python/test_qgsrenderer.py @@ -11,14 +11,14 @@ import qgis # NOQA -from qgis.core import (QgsRendererAbstractMetadata, - QgsApplication, - QgsVectorLayer, - QgsFeature, - QgsGeometry, - QgsPoint, - QgsPointXY - ) +from qgis.core import ( + QgsApplication, + QgsFeature, + QgsGeometry, + QgsPointXY, + QgsRendererAbstractMetadata, + QgsVectorLayer, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsrendererrasterpropertieswidget.py b/tests/src/python/test_qgsrendererrasterpropertieswidget.py index 0587e3fb21e6..a019e9983a91 100644 --- a/tests/src/python/test_qgsrendererrasterpropertieswidget.py +++ b/tests/src/python/test_qgsrendererrasterpropertieswidget.py @@ -1,8 +1,16 @@ import pathlib -from qgis.testing import start_app, unittest, TestCase + +from qgis.core import ( + QgsMultiBandColorRenderer, + QgsRasterLayer, + QgsSingleBandGrayRenderer, +) +from qgis.gui import ( + QgsMapCanvas, + QgsRendererRasterPropertiesWidget, +) +from qgis.testing import TestCase, unittest from qgis.testing.mocked import get_iface -from qgis.core import QgsRasterLayer, QgsProject, QgsMultiBandColorRenderer, QgsRasterRenderer, QgsSingleBandGrayRenderer -from qgis.gui import QgsRendererRasterPropertiesWidget, QgsMapCanvas, QgsMultiBandColorRendererWidget, QgsRasterRendererWidget class QgsRendererRasterPropertiesTestCases(TestCase): diff --git a/tests/src/python/test_qgsreport.py b/tests/src/python/test_qgsreport.py index 8cb4f19c76a1..2a13b3614818 100644 --- a/tests/src/python/test_qgsreport.py +++ b/tests/src/python/test_qgsreport.py @@ -10,19 +10,19 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsProject, - QgsLayout, - QgsReport, - QgsReportSectionLayout, - QgsReportSectionFieldGroup, - QgsVectorLayer, - QgsField, - QgsFeature, - QgsReadWriteContext, - QgsUnitTypes) -from qgis.testing import start_app, unittest from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsFeature, + QgsLayout, + QgsProject, + QgsReadWriteContext, + QgsReport, + QgsReportSectionFieldGroup, + QgsReportSectionLayout, + QgsUnitTypes, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsrubberband.py b/tests/src/python/test_qgsrubberband.py index 111ab7db0ba6..569c2b3fae77 100644 --- a/tests/src/python/test_qgsrubberband.py +++ b/tests/src/python/test_qgsrubberband.py @@ -8,15 +8,6 @@ import qgis # NOQA -from qgis.PyQt.QtCore import ( - QSize -) -from qgis.PyQt.QtGui import ( - QResizeEvent -) -from qgis.core import ( - QgsProject, -) from qgis.gui import QgsRubberBand from qgis.testing import start_app, unittest from qgis.testing.mocked import get_iface diff --git a/tests/src/python/test_qgsscalebarrendererregistry.py b/tests/src/python/test_qgsscalebarrendererregistry.py index b00700e00417..9355b54f984e 100644 --- a/tests/src/python/test_qgsscalebarrendererregistry.py +++ b/tests/src/python/test_qgsscalebarrendererregistry.py @@ -11,8 +11,7 @@ import qgis # NOQA -from qgis.core import (QgsScaleBarRendererRegistry, - QgsScaleBarRenderer) +from qgis.core import QgsScaleBarRenderer, QgsScaleBarRendererRegistry from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsscalecalculator.py b/tests/src/python/test_qgsscalecalculator.py index 65f87c0b8b7c..8dd35acfbaa9 100644 --- a/tests/src/python/test_qgsscalecalculator.py +++ b/tests/src/python/test_qgsscalecalculator.py @@ -10,11 +10,8 @@ __copyright__ = 'Copyright 2021, The QGIS Project' import qgis # NOQA -import math -from qgis.PyQt.QtCore import Qt, QSizeF -from qgis.PyQt.QtTest import QSignalSpy -from qgis.core import QgsScaleCalculator, QgsRectangle, QgsUnitTypes +from qgis.core import QgsRectangle, QgsScaleCalculator, QgsUnitTypes from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsscalewidget.py b/tests/src/python/test_qgsscalewidget.py index b2cdd668606b..78ca0f42f53b 100644 --- a/tests/src/python/test_qgsscalewidget.py +++ b/tests/src/python/test_qgsscalewidget.py @@ -9,11 +9,10 @@ __date__ = '13/03/2019' __copyright__ = 'Copyright 2019, The QGIS Project' -import qgis # NOQA import math -from qgis.PyQt.QtCore import Qt -from qgis.PyQt.QtTest import QSignalSpy +import qgis # NOQA +from qgis.PyQt.QtTest import QSignalSpy from qgis.gui import QgsScaleWidget from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgssearchwidgettoolbutton.py b/tests/src/python/test_qgssearchwidgettoolbutton.py index da80f5cc486e..e7b7e9717510 100644 --- a/tests/src/python/test_qgssearchwidgettoolbutton.py +++ b/tests/src/python/test_qgssearchwidgettoolbutton.py @@ -12,7 +12,6 @@ import qgis # NOQA switch sip api from qgis.gui import QgsSearchWidgetToolButton, QgsSearchWidgetWrapper - from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgssearchwidgetwrapper.py b/tests/src/python/test_qgssearchwidgetwrapper.py index 7f1ce4128bb5..6dbf1b374494 100644 --- a/tests/src/python/test_qgssearchwidgetwrapper.py +++ b/tests/src/python/test_qgssearchwidgetwrapper.py @@ -10,22 +10,18 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - -from qgis.gui import (QgsSearchWidgetWrapper, - QgsDefaultSearchWidgetWrapper, - QgsValueMapSearchWidgetWrapper, - QgsValueRelationSearchWidgetWrapper, - QgsCheckboxSearchWidgetWrapper, - QgsDateTimeSearchWidgetWrapper, - QgsRelationReferenceSearchWidgetWrapper) -from qgis.core import (QgsVectorLayer, - QgsFeature, - QgsProject, - QgsRelation - ) -from qgis.PyQt.QtCore import QDateTime, QDate, QTime +from qgis.PyQt.QtCore import QDate, QDateTime, QTime from qgis.PyQt.QtWidgets import QWidget - +from qgis.core import QgsFeature, QgsProject, QgsRelation, QgsVectorLayer +from qgis.gui import ( + QgsCheckboxSearchWidgetWrapper, + QgsDateTimeSearchWidgetWrapper, + QgsDefaultSearchWidgetWrapper, + QgsRelationReferenceSearchWidgetWrapper, + QgsSearchWidgetWrapper, + QgsValueMapSearchWidgetWrapper, + QgsValueRelationSearchWidgetWrapper, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsselectioncontext.py b/tests/src/python/test_qgsselectioncontext.py index c910ee1dd6b3..3b1bbc0e4e04 100644 --- a/tests/src/python/test_qgsselectioncontext.py +++ b/tests/src/python/test_qgsselectioncontext.py @@ -8,9 +8,7 @@ import qgis # NOQA -from qgis.core import ( - QgsSelectionContext, -) +from qgis.core import QgsSelectionContext from qgis.testing import unittest diff --git a/tests/src/python/test_qgsserver.py b/tests/src/python/test_qgsserver.py index 44477669855d..82884b7a6b17 100644 --- a/tests/src/python/test_qgsserver.py +++ b/tests/src/python/test_qgsserver.py @@ -30,26 +30,35 @@ # Deterministic XML os.environ['QT_HASH_SEED'] = '1' +import base64 +import difflib +import email import re -import urllib.request -import urllib.parse +import tempfile import urllib.error -import email -import difflib +import urllib.parse +import urllib.request from io import StringIO -from qgis.server import QgsServer, QgsServerRequest, QgsBufferServerRequest, QgsBufferServerResponse, QgsServerParameterDefinition -from qgis.core import QgsRenderChecker, QgsApplication, QgsFontUtils, QgsMultiRenderChecker -from qgis.testing import unittest, start_app -from qgis.PyQt.QtCore import QSize, QUrlQuery -from qgis.PyQt.QtGui import QColor -from utilities import unitTestDataPath +from shutil import copytree import osgeo.gdal # NOQA -import tempfile -import base64 -from shutil import copytree +from qgis.core import ( + QgsFontUtils, + QgsMultiRenderChecker, +) +from qgis.PyQt.QtCore import QSize +from qgis.PyQt.QtGui import QColor +from qgis.server import ( + QgsBufferServerRequest, + QgsBufferServerResponse, + QgsServer, + QgsServerParameterDefinition, + QgsServerRequest, +) +from qgis.testing import start_app, unittest +from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsserver_accesscontrol.py b/tests/src/python/test_qgsserver_accesscontrol.py index f48c5a89325b..31be7777dc39 100644 --- a/tests/src/python/test_qgsserver_accesscontrol.py +++ b/tests/src/python/test_qgsserver_accesscontrol.py @@ -9,22 +9,25 @@ __date__ = '28/08/2015' __copyright__ = 'Copyright 2015, The QGIS Project' -import qgis # NOQA -import shutil - import os -from shutil import copyfile +import shutil +import tempfile from math import sqrt -from utilities import unitTestDataPath + +import qgis # NOQA from osgeo import gdal from osgeo.gdalconst import GA_ReadOnly -from qgis.server import QgsServer, QgsAccessControlFilter, QgsServerRequest, QgsBufferServerRequest, QgsBufferServerResponse -from qgis.core import QgsRenderChecker, QgsApplication from qgis.PyQt.QtCore import QSize -import tempfile -from test_qgsserver import QgsServerTestBase -import base64 +from qgis.core import QgsRenderChecker +from qgis.server import ( + QgsAccessControlFilter, + QgsBufferServerRequest, + QgsBufferServerResponse, + QgsServerRequest, +) +from test_qgsserver import QgsServerTestBase +from utilities import unitTestDataPath XML_NS = \ 'service="WFS" version="1.0.0" ' \ diff --git a/tests/src/python/test_qgsserver_accesscontrol_fix_filters.py b/tests/src/python/test_qgsserver_accesscontrol_fix_filters.py index 9510d9a8e0c2..45e3d53011a7 100644 --- a/tests/src/python/test_qgsserver_accesscontrol_fix_filters.py +++ b/tests/src/python/test_qgsserver_accesscontrol_fix_filters.py @@ -11,11 +11,13 @@ __date__ = '10/09/2022' __copyright__ = 'Copyright 2022, The QGIS Project' -from qgis.testing import unittest -import urllib.request -import urllib.parse import urllib.error -from test_qgsserver_accesscontrol import TestQgsServerAccessControl, XML_NS +import urllib.parse +import urllib.request + +from qgis.testing import unittest + +from test_qgsserver_accesscontrol import TestQgsServerAccessControl class TestQgsServerAccessControlFixFilters(TestQgsServerAccessControl): diff --git a/tests/src/python/test_qgsserver_accesscontrol_wcs.py b/tests/src/python/test_qgsserver_accesscontrol_wcs.py index dca33b417f30..3c731c2bbce9 100644 --- a/tests/src/python/test_qgsserver_accesscontrol_wcs.py +++ b/tests/src/python/test_qgsserver_accesscontrol_wcs.py @@ -11,10 +11,12 @@ __date__ = '28/08/2015' __copyright__ = 'Copyright 2015, The QGIS Project' -from qgis.testing import unittest -import urllib.request -import urllib.parse import urllib.error +import urllib.parse +import urllib.request + +from qgis.testing import unittest + from test_qgsserver_accesscontrol import TestQgsServerAccessControl diff --git a/tests/src/python/test_qgsserver_accesscontrol_wfs.py b/tests/src/python/test_qgsserver_accesscontrol_wfs.py index 2c34a92805b5..7cbe5c08ce19 100644 --- a/tests/src/python/test_qgsserver_accesscontrol_wfs.py +++ b/tests/src/python/test_qgsserver_accesscontrol_wfs.py @@ -11,11 +11,13 @@ __date__ = '28/08/2015' __copyright__ = 'Copyright 2015, The QGIS Project' -from qgis.testing import unittest -import urllib.request -import urllib.parse import urllib.error -from test_qgsserver_accesscontrol import TestQgsServerAccessControl, XML_NS +import urllib.parse +import urllib.request + +from qgis.testing import unittest + +from test_qgsserver_accesscontrol import XML_NS, TestQgsServerAccessControl class TestQgsServerAccessControlWFS(TestQgsServerAccessControl): diff --git a/tests/src/python/test_qgsserver_accesscontrol_wfs_transactional.py b/tests/src/python/test_qgsserver_accesscontrol_wfs_transactional.py index bc8ad25ed659..6174ff589b2c 100644 --- a/tests/src/python/test_qgsserver_accesscontrol_wfs_transactional.py +++ b/tests/src/python/test_qgsserver_accesscontrol_wfs_transactional.py @@ -12,8 +12,8 @@ __copyright__ = 'Copyright 2015, The QGIS Project' from qgis.testing import unittest -from test_qgsserver_accesscontrol import TestQgsServerAccessControl, XML_NS +from test_qgsserver_accesscontrol import XML_NS, TestQgsServerAccessControl WFS_TRANSACTION_INSERT = """ diff --git a/tests/src/python/test_qgsserver_accesscontrol_wms.py b/tests/src/python/test_qgsserver_accesscontrol_wms.py index 09f8800863cc..d1c939fa3ca8 100644 --- a/tests/src/python/test_qgsserver_accesscontrol_wms.py +++ b/tests/src/python/test_qgsserver_accesscontrol_wms.py @@ -11,22 +11,22 @@ __date__ = '28/08/2015' __copyright__ = 'Copyright 2015, The QGIS Project' -import os import json -from qgis.testing import unittest -import urllib.request -import urllib.parse +import os import urllib.error -from test_qgsserver_accesscontrol import TestQgsServerAccessControl -from utilities import unitTestDataPath +import urllib.parse +import urllib.request from qgis.core import QgsProject from qgis.server import ( - QgsServer, + QgsAccessControlFilter, QgsBufferServerRequest, QgsBufferServerResponse, - QgsAccessControlFilter ) +from qgis.testing import unittest + +from test_qgsserver_accesscontrol import TestQgsServerAccessControl +from utilities import unitTestDataPath class TestQgsServerAccessControlWMS(TestQgsServerAccessControl): diff --git a/tests/src/python/test_qgsserver_accesscontrol_wms_getlegendgraphic.py b/tests/src/python/test_qgsserver_accesscontrol_wms_getlegendgraphic.py index 2addac2c65b1..bdff6d563362 100644 --- a/tests/src/python/test_qgsserver_accesscontrol_wms_getlegendgraphic.py +++ b/tests/src/python/test_qgsserver_accesscontrol_wms_getlegendgraphic.py @@ -11,11 +11,12 @@ __date__ = '28/08/2015' __copyright__ = 'Copyright 2015, The QGIS Project' -import qgis # NOQA +import urllib.parse -from qgis.testing import unittest +import qgis # NOQA from qgis.PyQt.QtCore import QSize -import urllib.parse +from qgis.testing import unittest + from test_qgsserver_accesscontrol import TestQgsServerAccessControl diff --git a/tests/src/python/test_qgsserver_accesscontrol_wms_getmap_postgres.py b/tests/src/python/test_qgsserver_accesscontrol_wms_getmap_postgres.py index d5925e70de5b..700429b66c8a 100644 --- a/tests/src/python/test_qgsserver_accesscontrol_wms_getmap_postgres.py +++ b/tests/src/python/test_qgsserver_accesscontrol_wms_getmap_postgres.py @@ -12,16 +12,15 @@ __copyright__ = 'Copyright 2015, The QGIS Project' import os -import json -from qgis.testing import unittest -import urllib.request -import urllib.parse import urllib.error -from test_qgsserver_accesscontrol import TestQgsServerAccessControl -from utilities import unitTestDataPath +import urllib.parse +import urllib.request from qgis.core import QgsProviderRegistry from qgis.server import QgsAccessControlFilter +from qgis.testing import unittest + +from test_qgsserver_accesscontrol import TestQgsServerAccessControl class RestrictedAccessControlPG(QgsAccessControlFilter): diff --git a/tests/src/python/test_qgsserver_accesscontrol_wms_getprint_postgres.py b/tests/src/python/test_qgsserver_accesscontrol_wms_getprint_postgres.py index 3510ea2cbe57..cf60de5f7bd4 100644 --- a/tests/src/python/test_qgsserver_accesscontrol_wms_getprint_postgres.py +++ b/tests/src/python/test_qgsserver_accesscontrol_wms_getprint_postgres.py @@ -15,18 +15,19 @@ import os import re -import hashlib # Needed on Qt 5 so that the serialization of XML is consistent among all executions os.environ['QT_HASH_SEED'] = '1' -import urllib.parse - from qgis.core import QgsProject, QgsProviderRegistry, QgsVectorLayer from qgis.PyQt.QtCore import QTemporaryDir from qgis.PyQt.QtGui import QImage -from qgis.server import (QgsServer, QgsBufferServerRequest, - QgsBufferServerResponse, QgsAccessControlFilter) +from qgis.server import ( + QgsAccessControlFilter, + QgsBufferServerRequest, + QgsBufferServerResponse, + QgsServer, +) from qgis.testing import unittest from test_qgsserver import QgsServerTestBase from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsserver_api.py b/tests/src/python/test_qgsserver_api.py index 66cfdc1c275f..1e10acf84e74 100644 --- a/tests/src/python/test_qgsserver_api.py +++ b/tests/src/python/test_qgsserver_api.py @@ -14,47 +14,41 @@ # This will get replaced with a git SHA1 when you do a git archive __revision__ = '$Format:%H$' -import os import json +import os import re import shutil # Deterministic XML os.environ['QT_HASH_SEED'] = '1' +from urllib import parse + +from qgis.core import ( + QgsFeature, + QgsFeatureRequest, + QgsGeometry, + QgsProject, + QgsVectorLayer, + QgsVectorLayerServerProperties, +) +from qgis.PyQt import QtCore from qgis.server import ( QgsBufferServerRequest, QgsBufferServerResponse, QgsServer, QgsServerApi, QgsServerApiBadRequestException, - QgsServerQueryStringParameter, QgsServerApiContext, + QgsServerApiUtils, QgsServerOgcApi, QgsServerOgcApiHandler, - QgsServerApiUtils, - QgsServiceRegistry -) - -from qgis.core import ( - QgsProject, - QgsRectangle, - QgsVectorLayerServerProperties, - QgsFeatureRequest, - QgsVectorLayer, - QgsFeature, - QgsGeometry, + QgsServerQueryStringParameter, + QgsServiceRegistry, ) - -from qgis.PyQt import QtCore - from qgis.testing import unittest -from utilities import unitTestDataPath -from urllib import parse - -import tempfile - from test_qgsserver import QgsServerTestBase +from utilities import unitTestDataPath class QgsServerAPIUtilsTest(QgsServerTestBase): diff --git a/tests/src/python/test_qgsserver_apicontext.py b/tests/src/python/test_qgsserver_apicontext.py index 5dcc2b3d2c3b..7ab484b01ae1 100644 --- a/tests/src/python/test_qgsserver_apicontext.py +++ b/tests/src/python/test_qgsserver_apicontext.py @@ -15,8 +15,6 @@ __revision__ = '$Format:%H$' import os -import json -import re # Deterministic XML os.environ['QT_HASH_SEED'] = '1' @@ -24,14 +22,9 @@ from qgis.server import ( QgsBufferServerRequest, QgsBufferServerResponse, - QgsServerApiContext + QgsServerApiContext, ) from qgis.testing import unittest -from utilities import unitTestDataPath -from urllib import parse - -import tempfile - from test_qgsserver import QgsServerTestBase diff --git a/tests/src/python/test_qgsserver_cachemanager.py b/tests/src/python/test_qgsserver_cachemanager.py index f5fab5918eed..d0c50ff6171d 100644 --- a/tests/src/python/test_qgsserver_cachemanager.py +++ b/tests/src/python/test_qgsserver_cachemanager.py @@ -11,23 +11,25 @@ __date__ = '19/07/2018' __copyright__ = 'Copyright 2015, The QGIS Project' -import qgis # NOQA - +import hashlib import os -import urllib.request -import urllib.parse -import urllib.error import tempfile -import hashlib +import urllib.error +import urllib.parse +import urllib.request -from qgis.testing import unittest -from utilities import unitTestDataPath -from qgis.server import QgsServer, QgsServerCacheFilter, QgsServerRequest, QgsBufferServerRequest, \ - QgsBufferServerResponse -from qgis.core import QgsApplication, QgsFontUtils, QgsProject -from qgis.PyQt.QtCore import QIODevice, QFile, QByteArray, QBuffer, QSize +import qgis # NOQA +from qgis.PyQt.QtCore import QBuffer, QByteArray, QIODevice, QSize from qgis.PyQt.QtGui import QImage from qgis.PyQt.QtXml import QDomDocument +from qgis.core import QgsProject +from qgis.server import ( + QgsBufferServerRequest, + QgsBufferServerResponse, + QgsServerCacheFilter, + QgsServerRequest, +) +from qgis.testing import unittest from test_qgsserver import QgsServerTestBase diff --git a/tests/src/python/test_qgsserver_configcache.py b/tests/src/python/test_qgsserver_configcache.py index 521a4fa0e48c..ea40afb6f0b8 100644 --- a/tests/src/python/test_qgsserver_configcache.py +++ b/tests/src/python/test_qgsserver_configcache.py @@ -12,19 +12,15 @@ __copyright__ = 'Copyright 2015, The QGIS Project' import os -import sys -import qgis # NOQA - from pathlib import Path from time import time +import qgis # NOQA +from qgis.core import QgsApplication +from qgis.server import QgsConfigCache, QgsServerSettings from qgis.testing import unittest -from utilities import unitTestDataPath -from qgis.server import (QgsConfigCache, - QgsServerSettings) -from qgis.core import QgsApplication, QgsProject -from test_qgsserver import QgsServerTestBase +from utilities import unitTestDataPath class TestQgsServerConfigCache(unittest.TestCase): diff --git a/tests/src/python/test_qgsserver_landingpage.py b/tests/src/python/test_qgsserver_landingpage.py index a4cdf079885b..7c1032103711 100644 --- a/tests/src/python/test_qgsserver_landingpage.py +++ b/tests/src/python/test_qgsserver_landingpage.py @@ -14,36 +14,21 @@ # This will get replaced with a git SHA1 when you do a git archive __revision__ = '$Format:%H$' -import os import json -import re +import os import shutil # Deterministic XML os.environ['QT_HASH_SEED'] = '1' +from qgis.PyQt import QtCore from qgis.server import ( QgsBufferServerRequest, QgsBufferServerResponse, - QgsServerApi, - QgsServerApiBadRequestException, - QgsServerQueryStringParameter, - QgsServerApiContext, - QgsServerOgcApi, - QgsServerOgcApiHandler, - QgsServerApiUtils, - QgsServiceRegistry ) -from qgis.core import QgsProject, QgsRectangle, QgsVectorLayerServerProperties, QgsFeatureRequest -from qgis.PyQt import QtCore - from qgis.testing import unittest -from utilities import unitTestDataPath -from urllib import parse - -import tempfile - from test_qgsserver_api import QgsServerAPITestBase +from utilities import unitTestDataPath class QgsServerLandingPageTest(QgsServerAPITestBase): diff --git a/tests/src/python/test_qgsserver_locale_override.py b/tests/src/python/test_qgsserver_locale_override.py index b7afa87f0a94..348727e42013 100644 --- a/tests/src/python/test_qgsserver_locale_override.py +++ b/tests/src/python/test_qgsserver_locale_override.py @@ -23,14 +23,8 @@ # executions os.environ['QT_HASH_SEED'] = '1' -from utilities import ( - unitTestDataPath, -) from qgis.testing import unittest - from test_qgsserver_wms import TestQgsServerWMSTestBase -from qgis.core import QgsProject, QgsFontUtils -from qgis.server import QgsServer class TestQgsServerWMSLocaleOverride(TestQgsServerWMSTestBase): diff --git a/tests/src/python/test_qgsserver_modules.py b/tests/src/python/test_qgsserver_modules.py index 594233d129ff..d74f28bde14c 100644 --- a/tests/src/python/test_qgsserver_modules.py +++ b/tests/src/python/test_qgsserver_modules.py @@ -25,12 +25,11 @@ """ QGIS test for server services """ import os + from qgis.PyQt.QtCore import QBuffer, QIODevice -from qgis.testing import unittest from qgis.core import QgsApplication -from qgis.server import (QgsServer, - QgsService, - QgsServerResponse) +from qgis.server import QgsServer, QgsServerResponse, QgsService +from qgis.testing import unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsserver_plugins.py b/tests/src/python/test_qgsserver_plugins.py index 47209ec018b0..e822ef5a1e3b 100644 --- a/tests/src/python/test_qgsserver_plugins.py +++ b/tests/src/python/test_qgsserver_plugins.py @@ -15,15 +15,13 @@ import os -from qgis.server import QgsServer, QgsServiceRegistry, QgsService +import osgeo.gdal # NOQA from qgis.core import QgsMessageLog +from qgis.server import QgsServer, QgsService from qgis.testing import unittest -from utilities import unitTestDataPath -from test_qgsserver import QgsServerTestBase - - -import osgeo.gdal # NOQA +from test_qgsserver import QgsServerTestBase +from utilities import unitTestDataPath # Strip path and content length because path may vary RE_STRIP_UNCHECKABLE = br'MAP=[^"]+|Content-Length: \d+' @@ -181,8 +179,8 @@ def test_configpath(self): """ Test plugin can read confif path """ try: - from qgis.server import QgsServerFilter from qgis.core import QgsProject + from qgis.server import QgsServerFilter except ImportError: print("QGIS Server plugins are not compiled. Skipping test") return @@ -274,8 +272,8 @@ def test_streaming_pipeline(self): """ Test streaming pipeline propagation """ try: - from qgis.server import QgsServerFilter from qgis.core import QgsProject + from qgis.server import QgsServerFilter except ImportError: print("QGIS Server plugins are not compiled. Skipping test") return diff --git a/tests/src/python/test_qgsserver_projectutils.py b/tests/src/python/test_qgsserver_projectutils.py index 30b3b6b45186..bb7f9ac5ad99 100644 --- a/tests/src/python/test_qgsserver_projectutils.py +++ b/tests/src/python/test_qgsserver_projectutils.py @@ -14,9 +14,10 @@ import os -from qgis.server import QgsServerProjectUtils from qgis.core import QgsProject +from qgis.server import QgsServerProjectUtils from qgis.testing import unittest + from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsserver_request.py b/tests/src/python/test_qgsserver_request.py index 2d9cab961839..f4f83cb828c5 100644 --- a/tests/src/python/test_qgsserver_request.py +++ b/tests/src/python/test_qgsserver_request.py @@ -20,8 +20,12 @@ from urllib.parse import parse_qs, urlencode, urlparse from qgis.PyQt.QtCore import QUrl -from qgis.server import (QgsBufferServerResponse, QgsFcgiServerRequest, - QgsServerRequest) +from qgis.server import ( + QgsBufferServerResponse, + QgsFcgiServerRequest, + QgsServerRequest, +) + from test_qgsserver import QgsServerTestBase diff --git a/tests/src/python/test_qgsserver_security.py b/tests/src/python/test_qgsserver_security.py index c531fa83bad1..48e35de48990 100644 --- a/tests/src/python/test_qgsserver_security.py +++ b/tests/src/python/test_qgsserver_security.py @@ -12,20 +12,23 @@ __date__ = '31/01/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -from qgis.utils import spatialite_connect import os +from qgis.utils import spatialite_connect + # Needed on Qt 5 so that the serialization of XML is consistent among all executions os.environ['QT_HASH_SEED'] = '1' import time import urllib.parse + from shutil import copyfile + from qgis.core import QgsApplication from qgis.server import QgsServer from qgis.testing import unittest -from utilities import unitTestDataPath from test_qgsserver import QgsServerTestBase +from utilities import unitTestDataPath class TestQgsServerSecurity(QgsServerTestBase): diff --git a/tests/src/python/test_qgsserver_service_url_env.py b/tests/src/python/test_qgsserver_service_url_env.py index 657e5db918e3..094935ff5ca7 100644 --- a/tests/src/python/test_qgsserver_service_url_env.py +++ b/tests/src/python/test_qgsserver_service_url_env.py @@ -10,16 +10,11 @@ # Deterministic XML os.environ['QT_HASH_SEED'] = '1' -import urllib.request -import urllib.parse -import urllib.error - -from qgis.server import QgsServer from qgis.core import QgsFontUtils -from qgis.testing import unittest, start_app +from qgis.server import QgsServer +from qgis.testing import start_app, unittest from utilities import unitTestDataPath - start_app() diff --git a/tests/src/python/test_qgsserver_services.py b/tests/src/python/test_qgsserver_services.py index 8703862fa2fc..d0bc1a8602c0 100644 --- a/tests/src/python/test_qgsserver_services.py +++ b/tests/src/python/test_qgsserver_services.py @@ -25,13 +25,14 @@ """ QGIS test for server services """ from qgis.PyQt.QtCore import QBuffer, QIODevice, QTextStream -from qgis.testing import unittest -from qgis.server import (QgsServiceRegistry, - QgsService, - QgsServerRequest, - QgsServerResponse) - from qgis.core import QgsApplication +from qgis.server import ( + QgsServerRequest, + QgsServerResponse, + QgsService, + QgsServiceRegistry, +) +from qgis.testing import unittest class Response(QgsServerResponse): diff --git a/tests/src/python/test_qgsserver_settings.py b/tests/src/python/test_qgsserver_settings.py index fcb343e72814..4d77f033513f 100644 --- a/tests/src/python/test_qgsserver_settings.py +++ b/tests/src/python/test_qgsserver_settings.py @@ -15,10 +15,10 @@ import os from qgis.PyQt.QtCore import QCoreApplication +from qgis.server import QgsServerSettings, QgsServerSettingsEnv +from qgis.testing import unittest from utilities import unitTestDataPath -from qgis.testing import unittest -from qgis.server import QgsServerSettings, QgsServerSettingsEnv DEFAULT_CACHE_SIZE = 256 * 1024 * 1024 diff --git a/tests/src/python/test_qgsserver_wfs.py b/tests/src/python/test_qgsserver_wfs.py index 30399d01c1c5..42e897ec86e8 100644 --- a/tests/src/python/test_qgsserver_wfs.py +++ b/tests/src/python/test_qgsserver_wfs.py @@ -20,27 +20,26 @@ import json import re -import urllib.request -import urllib.parse import urllib.error -from lxml import etree as et -from qgis.server import QgsServerRequest +import urllib.parse +import urllib.request -from qgis.testing import unittest +import osgeo.gdal # NOQA + +from lxml import etree as et from qgis.core import ( - QgsProject, - QgsFeature, - QgsVectorLayer, - QgsFeatureRequest, - QgsExpression, QgsCoordinateReferenceSystem, QgsCoordinateTransform, QgsCoordinateTransformContext, + QgsExpression, + QgsFeature, + QgsFeatureRequest, QgsGeometry, + QgsProject, + QgsVectorLayer, ) - -import osgeo.gdal # NOQA - +from qgis.server import QgsServerRequest +from qgis.testing import unittest from test_qgsserver import QgsServerTestBase # Strip path and content length because path may vary diff --git a/tests/src/python/test_qgsserver_wfst.py b/tests/src/python/test_qgsserver_wfst.py index cfdf58bd011e..3d7a948fed6c 100644 --- a/tests/src/python/test_qgsserver_wfst.py +++ b/tests/src/python/test_qgsserver_wfst.py @@ -31,25 +31,24 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import os -import sys import re import subprocess -from shutil import copytree, rmtree +import sys import tempfile -from utilities import unitTestDataPath, waitServer +from shutil import copytree, rmtree + from qgis.core import ( - QgsVectorLayer, + QgsExpression, QgsFeature, + QgsFeatureRequest, QgsGeometry, QgsPointXY, QgsRectangle, - QgsFeatureRequest, - QgsExpression, -) -from qgis.testing import ( - start_app, - unittest, + QgsVectorLayer, ) +from qgis.testing import start_app, unittest + +from utilities import unitTestDataPath, waitServer # 0 = auto QGIS_SERVER_PORT = os.environ.get('QGIS_SERVER_PORT', '0') diff --git a/tests/src/python/test_qgsserver_wms.py b/tests/src/python/test_qgsserver_wms.py index dc7e5e1471b0..9f69b467d2dc 100644 --- a/tests/src/python/test_qgsserver_wms.py +++ b/tests/src/python/test_qgsserver_wms.py @@ -13,27 +13,25 @@ __date__ = '25/05/2015' __copyright__ = 'Copyright 2015, The QGIS Project' -import os import json +import os # Needed on Qt 5 so that the serialization of XML is consistent among all executions os.environ['QT_HASH_SEED'] = '1' import re -import urllib.request -import urllib.parse import urllib.error - -from qgis.testing import unittest +import urllib.parse +import urllib.request import osgeo.gdal # NOQA from owslib.wms import WebMapService - -from test_qgsserver import QgsServerTestBase from qgis.core import QgsProject -from qgis.server import QgsServer, QgsServerRequest, QgsBufferServerResponse from qgis.PyQt.QtCore import QUrl +from qgis.server import QgsBufferServerResponse, QgsServer, QgsServerRequest +from qgis.testing import unittest +from test_qgsserver import QgsServerTestBase # Strip path and content length because path may vary RE_STRIP_UNCHECKABLE = b'MAP=[^"]+|SERVICE=[^"]+|Content-Length: \\d+' diff --git a/tests/src/python/test_qgsserver_wms_dimension.py b/tests/src/python/test_qgsserver_wms_dimension.py index 0c56fdbbcfeb..982eba01aaff 100644 --- a/tests/src/python/test_qgsserver_wms_dimension.py +++ b/tests/src/python/test_qgsserver_wms_dimension.py @@ -12,21 +12,16 @@ __date__ = '29/08/2019' __copyright__ = 'Copyright 2019, The QGIS Project' -import qgis # NOQA - import os -from utilities import unitTestDataPath -from qgis.testing import unittest -from qgis.server import QgsServer, QgsAccessControlFilter, QgsServerRequest, QgsBufferServerRequest, QgsBufferServerResponse -from qgis.core import QgsRenderChecker, QgsApplication -from qgis.PyQt.QtCore import QSize -import tempfile -import urllib.request -import urllib.parse import urllib.error -from test_qgsserver import QgsServerTestBase +import urllib.parse +import urllib.request + +import qgis # NOQA +from qgis.PyQt.QtCore import QSize +from qgis.testing import unittest + from test_qgsserver_wms import TestQgsServerWMSTestBase -import base64 class TestQgsServerWMSDimension(TestQgsServerWMSTestBase): diff --git a/tests/src/python/test_qgsserver_wms_dxf.py b/tests/src/python/test_qgsserver_wms_dxf.py index 927727fdb84f..07a23e291236 100644 --- a/tests/src/python/test_qgsserver_wms_dxf.py +++ b/tests/src/python/test_qgsserver_wms_dxf.py @@ -14,17 +14,14 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import os - import urllib.parse +from qgis.PyQt import QtCore +from qgis.core import QgsVectorLayer from qgis.testing import unittest from test_qgsserver import QgsServerTestBase -from qgis.core import (QgsVectorLayer) - -from qgis.PyQt import QtCore - # Needed on Qt 5 so that the serialization of XML is consistent among all executions os.environ['QT_HASH_SEED'] = '1' diff --git a/tests/src/python/test_qgsserver_wms_getfeatureinfo.py b/tests/src/python/test_qgsserver_wms_getfeatureinfo.py index b4ac76b66053..d5b1918a8801 100644 --- a/tests/src/python/test_qgsserver_wms_getfeatureinfo.py +++ b/tests/src/python/test_qgsserver_wms_getfeatureinfo.py @@ -19,22 +19,28 @@ # executions os.environ['QT_HASH_SEED'] = '1' -import re -import urllib.request -import urllib.parse -import urllib.error - import json - -from qgis.testing import unittest -from qgis.PyQt.QtCore import QSize, QVariant +import urllib.error +import urllib.parse +import urllib.request import osgeo.gdal # NOQA -from test_qgsserver_wms import TestQgsServerWMSTestBase -from qgis.core import (QgsProject, QgsField, QgsFields, QgsFeature, QgsGeometry, - QgsMemoryProviderUtils, QgsWkbTypes, QgsCoordinateReferenceSystem, QgsMapLayer) +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsFeature, + QgsField, + QgsFields, + QgsGeometry, + QgsMapLayer, + QgsMemoryProviderUtils, + QgsProject, + QgsWkbTypes, +) +from qgis.PyQt.QtCore import QVariant from qgis.server import QgsBufferServerRequest, QgsBufferServerResponse +from qgis.testing import unittest +from test_qgsserver_wms import TestQgsServerWMSTestBase class TestQgsServerWMSGetFeatureInfo(TestQgsServerWMSTestBase): diff --git a/tests/src/python/test_qgsserver_wms_getfeatureinfo_postgres.py b/tests/src/python/test_qgsserver_wms_getfeatureinfo_postgres.py index c13cc636fd28..12b80747c4b5 100644 --- a/tests/src/python/test_qgsserver_wms_getfeatureinfo_postgres.py +++ b/tests/src/python/test_qgsserver_wms_getfeatureinfo_postgres.py @@ -16,22 +16,25 @@ __revision__ = '$Format:%H$' import os -import tempfile # Needed on Qt 5 so that the serialization of XML is consistent among all # executions os.environ['QT_HASH_SEED'] = '1' -import re +import json import urllib.parse import xml.etree.ElementTree as ET -import json +from qgis.core import ( + QgsExpression, + QgsFeatureRequest, + QgsProject, + QgsProviderRegistry, + QgsVectorLayer, +) +from qgis.server import QgsBufferServerRequest, QgsBufferServerResponse from qgis.testing import unittest - from test_qgsserver_wms import TestQgsServerWMSTestBase -from qgis.core import QgsProject, QgsVectorLayer, QgsFeatureRequest, QgsExpression, QgsProviderRegistry -from qgis.server import QgsBufferServerRequest, QgsBufferServerResponse class TestQgsServerWMSGetFeatureInfoPG(TestQgsServerWMSTestBase): diff --git a/tests/src/python/test_qgsserver_wms_getlegendgraphic.py b/tests/src/python/test_qgsserver_wms_getlegendgraphic.py index efcc05b13ed4..df033195b164 100644 --- a/tests/src/python/test_qgsserver_wms_getlegendgraphic.py +++ b/tests/src/python/test_qgsserver_wms_getlegendgraphic.py @@ -18,31 +18,27 @@ # Needed on Qt 5 so that the serialization of XML is consistent among all executions os.environ['QT_HASH_SEED'] = '1' -import re import json -import urllib.request -import urllib.parse import urllib.error - -from qgis.testing import unittest -from qgis.PyQt.QtCore import QSize +import urllib.parse +import urllib.request import osgeo.gdal # NOQA -from test_qgsserver_wms import TestQgsServerWMSTestBase from qgis.core import ( - QgsProject, QgsMarkerSymbol, + QgsProject, QgsRuleBasedRenderer, QgsVectorLayer, ) - +from qgis.PyQt.QtCore import QSize from qgis.server import ( QgsBufferServerRequest, QgsBufferServerResponse, QgsServer, - QgsServerRequest, ) +from qgis.testing import unittest +from test_qgsserver_wms import TestQgsServerWMSTestBase # Strip path and content length because path may vary RE_STRIP_UNCHECKABLE = br'MAP=[^"]+|Content-Length: \d+' diff --git a/tests/src/python/test_qgsserver_wms_getmap.py b/tests/src/python/test_qgsserver_wms_getmap.py index 981dae7139ee..697b4ae192da 100644 --- a/tests/src/python/test_qgsserver_wms_getmap.py +++ b/tests/src/python/test_qgsserver_wms_getmap.py @@ -18,23 +18,25 @@ # Needed on Qt 5 so that the serialization of XML is consistent among all executions os.environ['QT_HASH_SEED'] = '1' -import re -import urllib.request -import urllib.parse import urllib.error - -from lxml import etree as et - -from qgis.testing import unittest -from qgis.PyQt.QtCore import QSize, QDate, QDateTime, QTime -from qgis.PyQt.QtGui import QImage, QColor +import urllib.parse +import urllib.request import osgeo.gdal # NOQA +from lxml import etree as et +from qgis.core import ( + QgsFeature, + QgsGeometry, + QgsProject, + QgsVectorLayer, + QgsVectorLayerTemporalProperties, +) +from qgis.PyQt.QtCore import QDate, QDateTime, QTime +from qgis.PyQt.QtGui import QColor, QImage +from qgis.testing import unittest from test_qgsserver import QgsServerTestBase from utilities import unitTestDataPath -from qgis.core import QgsProject, QgsVectorLayer, QgsVectorLayerTemporalProperties, QgsGeometry, QgsFeature -from qgis.server import QgsServerProjectUtils # Strip path and content length because path may vary RE_STRIP_UNCHECKABLE = br'MAP=[^"]+|Content-Length: \d+' @@ -1331,9 +1333,9 @@ def test_wms_getmap_annotations(self): self._img_diff_error(r, h, "WMS_GetMap_Annotations") def test_wms_getmap_sld(self): + import http.server import socketserver import threading - import http.server # Bring up a simple HTTP server os.chdir(unitTestDataPath() + '') diff --git a/tests/src/python/test_qgsserver_wms_getmap_ignore_bad_layers.py b/tests/src/python/test_qgsserver_wms_getmap_ignore_bad_layers.py index d6ec08931fc1..037c43f65c39 100644 --- a/tests/src/python/test_qgsserver_wms_getmap_ignore_bad_layers.py +++ b/tests/src/python/test_qgsserver_wms_getmap_ignore_bad_layers.py @@ -20,19 +20,14 @@ # Needed on Qt 5 so that the serialization of XML is consistent among all executions os.environ['QT_HASH_SEED'] = '1' -import re -import urllib.request -import urllib.parse import urllib.error - -from qgis.testing import unittest -from qgis.PyQt.QtCore import QSize +import urllib.parse +import urllib.request import osgeo.gdal # NOQA +from qgis.testing import unittest from test_qgsserver import QgsServerTestBase -from utilities import unitTestDataPath -from qgis.core import QgsProject, QgsApplication # Strip path and content length because path may vary RE_STRIP_UNCHECKABLE = br'MAP=[^"]+|Content-Length: \d+' diff --git a/tests/src/python/test_qgsserver_wms_getmap_size_project.py b/tests/src/python/test_qgsserver_wms_getmap_size_project.py index b3d9c4d15f7c..25d8c2575931 100644 --- a/tests/src/python/test_qgsserver_wms_getmap_size_project.py +++ b/tests/src/python/test_qgsserver_wms_getmap_size_project.py @@ -27,7 +27,6 @@ import urllib.parse from qgis.testing import unittest - from test_qgsserver import QgsServerTestBase diff --git a/tests/src/python/test_qgsserver_wms_getmap_size_server.py b/tests/src/python/test_qgsserver_wms_getmap_size_server.py index 9f638dc8b546..31f631d04034 100644 --- a/tests/src/python/test_qgsserver_wms_getmap_size_server.py +++ b/tests/src/python/test_qgsserver_wms_getmap_size_server.py @@ -24,7 +24,6 @@ os.environ['QT_HASH_SEED'] = '1' from qgis.testing import unittest - from test_qgsserver import QgsServerTestBase from test_qgsserver_wms_getmap_size_project import make_request diff --git a/tests/src/python/test_qgsserver_wms_getprint.py b/tests/src/python/test_qgsserver_wms_getprint.py index 5650b0b48c6e..75fbb6990507 100644 --- a/tests/src/python/test_qgsserver_wms_getprint.py +++ b/tests/src/python/test_qgsserver_wms_getprint.py @@ -20,12 +20,10 @@ import urllib.parse +from qgis.PyQt.QtCore import QSize from qgis.testing import unittest - from test_qgsserver import QgsServerTestBase -from qgis.PyQt.QtCore import QSize - class TestQgsServerWMSGetPrint(QgsServerTestBase): """QGIS Server WMS Tests for GetPrint request""" diff --git a/tests/src/python/test_qgsserver_wms_getprint_atlas.py b/tests/src/python/test_qgsserver_wms_getprint_atlas.py index 6cb15c0f510c..56bef8b17be2 100644 --- a/tests/src/python/test_qgsserver_wms_getprint_atlas.py +++ b/tests/src/python/test_qgsserver_wms_getprint_atlas.py @@ -20,11 +20,10 @@ import urllib.parse +from qgis.core import QgsProject from qgis.testing import unittest -from utilities import unitTestDataPath from test_qgsserver import QgsServerTestBase - -from qgis.core import QgsProject +from utilities import unitTestDataPath class TestQgsServerWMSGetPrintAtlas(QgsServerTestBase): diff --git a/tests/src/python/test_qgsserver_wms_getprint_extra.py b/tests/src/python/test_qgsserver_wms_getprint_extra.py index 1e13c13575e3..45fe7caa8b5f 100644 --- a/tests/src/python/test_qgsserver_wms_getprint_extra.py +++ b/tests/src/python/test_qgsserver_wms_getprint_extra.py @@ -20,10 +20,9 @@ import urllib.parse +from qgis.server import QgsServerRequest from qgis.testing import unittest - from test_qgsserver import QgsServerTestBase -from qgis.server import QgsServerRequest class TestQgsServerWMSGetPrintExtra(QgsServerTestBase): diff --git a/tests/src/python/test_qgsserver_wms_getprint_legend.py b/tests/src/python/test_qgsserver_wms_getprint_legend.py index 3574c5a2fe54..1c8ac6006a1d 100644 --- a/tests/src/python/test_qgsserver_wms_getprint_legend.py +++ b/tests/src/python/test_qgsserver_wms_getprint_legend.py @@ -19,13 +19,11 @@ # Needed on Qt 5 so that the serialization of XML is consistent among all executions os.environ['QT_HASH_SEED'] = '1' -from qgis.testing import unittest -from qgis.server import QgsBufferServerRequest, QgsBufferServerResponse from qgis.core import QgsProject from qgis.PyQt.QtCore import QTemporaryDir from qgis.PyQt.QtGui import QImage - - +from qgis.server import QgsBufferServerRequest, QgsBufferServerResponse +from qgis.testing import unittest from test_qgsserver import QgsServerTestBase from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsserver_wms_getprint_maptheme.py b/tests/src/python/test_qgsserver_wms_getprint_maptheme.py index 85abb1aca67e..74bdfe893c24 100644 --- a/tests/src/python/test_qgsserver_wms_getprint_maptheme.py +++ b/tests/src/python/test_qgsserver_wms_getprint_maptheme.py @@ -14,20 +14,15 @@ __copyright__ = 'Copyright 2021, The QGIS Project' import os -import shutil # Needed on Qt 5 so that the serialization of XML is consistent among all executions os.environ['QT_HASH_SEED'] = '1' -from qgis.testing import unittest -from qgis.server import QgsBufferServerRequest, QgsBufferServerResponse from qgis.core import QgsProject -from qgis.PyQt.QtCore import QTemporaryDir from qgis.PyQt.QtGui import QImage - - +from qgis.server import QgsBufferServerRequest, QgsBufferServerResponse +from qgis.testing import unittest from test_qgsserver import QgsServerTestBase -from utilities import unitTestDataPath class PyQgsServerWMSGetPrintMapTheme(QgsServerTestBase): diff --git a/tests/src/python/test_qgsserver_wms_getprint_outputs.py b/tests/src/python/test_qgsserver_wms_getprint_outputs.py index d1ef44ecbbb8..327c8c043763 100644 --- a/tests/src/python/test_qgsserver_wms_getprint_outputs.py +++ b/tests/src/python/test_qgsserver_wms_getprint_outputs.py @@ -18,20 +18,19 @@ # Needed on Qt 5 so that the serialization of XML is consistent among all executions os.environ['QT_HASH_SEED'] = '1' +import base64 +import subprocess +import tempfile import urllib.parse -from qgis.testing import unittest -from qgis.PyQt.QtCore import QSize, Qt -from qgis.PyQt.QtGui import QImage, QPainter -from qgis.PyQt.QtSvg import QSvgRenderer, QSvgGenerator - import osgeo.gdal # NOQA -import tempfile -import base64 -import subprocess -from test_qgsserver import QgsServerTestBase from qgis.core import QgsMultiRenderChecker +from qgis.PyQt.QtCore import QSize, Qt +from qgis.PyQt.QtGui import QImage, QPainter +from qgis.PyQt.QtSvg import QSvgRenderer +from qgis.testing import unittest +from test_qgsserver import QgsServerTestBase from utilities import getExecutablePath, unitTestDataPath diff --git a/tests/src/python/test_qgsserver_wmts.py b/tests/src/python/test_qgsserver_wmts.py index 3c937debb495..458f2065fffc 100644 --- a/tests/src/python/test_qgsserver_wmts.py +++ b/tests/src/python/test_qgsserver_wmts.py @@ -19,19 +19,15 @@ os.environ['QT_HASH_SEED'] = '1' import re -import urllib.request -import urllib.parse import urllib.error - -from qgis.server import QgsServerRequest - -from qgis.testing import unittest -from qgis.PyQt.QtCore import QSize +import urllib.parse +import urllib.request import osgeo.gdal # NOQA -from test_qgsserver import QgsServerTestBase from qgis.core import QgsProject +from qgis.testing import unittest +from test_qgsserver import QgsServerTestBase # Strip path and content length because path may vary RE_STRIP_UNCHECKABLE = br'MAP=[^"]+|Content-Length: \d+|timeStamp="[^"]+"' diff --git a/tests/src/python/test_qgsserverlogger.py b/tests/src/python/test_qgsserverlogger.py index 4a08bcab2e53..aa4b92f014d0 100644 --- a/tests/src/python/test_qgsserverlogger.py +++ b/tests/src/python/test_qgsserverlogger.py @@ -9,8 +9,8 @@ import os -from qgis.testing import unittest from qgis.server import QgsServerLogger +from qgis.testing import unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgssettings.py b/tests/src/python/test_qgssettings.py index 679e0dc3d4cd..9a03b214b903 100644 --- a/tests/src/python/test_qgssettings.py +++ b/tests/src/python/test_qgssettings.py @@ -11,11 +11,12 @@ import os import tempfile -from qgis.core import Qgis, QgsSettings, QgsTolerance, QgsMapLayerProxyModel -from qgis.testing import start_app, unittest -from qgis.PyQt.QtCore import QSettings, QVariant from pathlib import Path +from qgis.PyQt.QtCore import QSettings, QVariant +from qgis.core import Qgis, QgsMapLayerProxyModel, QgsSettings, QgsTolerance +from qgis.testing import start_app, unittest + __author__ = 'Alessandro Pasotti' __date__ = '02/02/2017' __copyright__ = 'Copyright 2017, The QGIS Project' diff --git a/tests/src/python/test_qgssettingsentry.py b/tests/src/python/test_qgssettingsentry.py index d6306d1886db..fde434b54c24 100644 --- a/tests/src/python/test_qgssettingsentry.py +++ b/tests/src/python/test_qgssettingsentry.py @@ -10,11 +10,26 @@ """ from qgis import core as qgis_core -from qgis.core import Qgis, QgsSettings, QgsSettingsTree, QgsSettingsEntryVariant, QgsSettingsEntryString, QgsSettingsEntryStringList, QgsSettingsEntryBool, QgsSettingsEntryInteger, QgsSettingsEntryDouble, QgsSettingsEntryColor, QgsSettingsEntryEnumFlag, QgsUnitTypes, QgsMapLayerProxyModel, QgsSettingsEntryVariantMap, QgsSettingsEntryGroup -from qgis.testing import start_app, unittest - from qgis.PyQt.QtCore import Qt from qgis.PyQt.QtGui import QColor +from qgis.core import ( + Qgis, + QgsMapLayerProxyModel, + QgsSettings, + QgsSettingsEntryBool, + QgsSettingsEntryColor, + QgsSettingsEntryDouble, + QgsSettingsEntryEnumFlag, + QgsSettingsEntryGroup, + QgsSettingsEntryInteger, + QgsSettingsEntryString, + QgsSettingsEntryStringList, + QgsSettingsEntryVariant, + QgsSettingsEntryVariantMap, + QgsSettingsTree, + QgsUnitTypes, +) +from qgis.testing import start_app, unittest __author__ = 'Damiano Lombardi' __date__ = '02/04/2021' diff --git a/tests/src/python/test_qgssettingsregistry.py b/tests/src/python/test_qgssettingsregistry.py index 19282641bdcb..00189c71005f 100644 --- a/tests/src/python/test_qgssettingsregistry.py +++ b/tests/src/python/test_qgssettingsregistry.py @@ -9,7 +9,11 @@ (at your option) any later version. """ -from qgis.core import QgsSettingsRegistry, QgsSettingsRegistryCore, QgsSettingsEntryBase, QgsSettingsEntryInteger, QgsApplication +from qgis.core import ( + QgsApplication, + QgsSettingsEntryInteger, + QgsSettingsRegistry, +) from qgis.testing import start_app, unittest __author__ = 'Damiano Lombardi' diff --git a/tests/src/python/test_qgssettingstreenode.py b/tests/src/python/test_qgssettingstreenode.py index 574768b41307..b6d134324053 100644 --- a/tests/src/python/test_qgssettingstreenode.py +++ b/tests/src/python/test_qgssettingstreenode.py @@ -9,10 +9,17 @@ (at your option) any later version. """ -from qgis.core import QgsSettingsException, QgsSettings, QgsSettingsTree, QgsSettingsTreeNode, QgsSettingsEntryString, QgsSettingsEntryEnumFlag, QgsUnitTypes +from qgis.core import ( + QgsSettings, + QgsSettingsEntryEnumFlag, + QgsSettingsEntryString, + QgsSettingsException, + QgsSettingsTree, + QgsSettingsTreeNode, + QgsUnitTypes, +) from qgis.testing import start_app, unittest - __author__ = 'Denis Rouzaud' __date__ = '19/12/2022' __copyright__ = 'Copyright 2022, The QGIS Project' diff --git a/tests/src/python/test_qgsshortcutsmanager.py b/tests/src/python/test_qgsshortcutsmanager.py index 457a3c2a4c6d..1ee4df08a23d 100644 --- a/tests/src/python/test_qgsshortcutsmanager.py +++ b/tests/src/python/test_qgsshortcutsmanager.py @@ -10,12 +10,10 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - -from qgis.core import QgsSettings -from qgis.gui import QgsShortcutsManager, QgsGui from qgis.PyQt.QtCore import QCoreApplication -from qgis.PyQt.QtWidgets import QWidget, QAction, QShortcut - +from qgis.PyQt.QtWidgets import QAction, QShortcut, QWidget +from qgis.core import QgsSettings +from qgis.gui import QgsGui, QgsShortcutsManager from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgssimplefillsymbollayer.py b/tests/src/python/test_qgssimplefillsymbollayer.py index 60815743ad3c..3f69f9ee9a04 100644 --- a/tests/src/python/test_qgssimplefillsymbollayer.py +++ b/tests/src/python/test_qgssimplefillsymbollayer.py @@ -19,31 +19,30 @@ __date__ = 'September 2020' __copyright__ = '(C) 2020, Nyall Dawson' -import qgis # NOQA import os -from utilities import unitTestDataPath +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QPointF, QSize, Qt +from qgis.PyQt.QtGui import QColor, QImage, QPainter +from qgis.core import ( + QgsFeature, + QgsFillSymbol, + QgsGeometry, + QgsMapSettings, + QgsMultiRenderChecker, + QgsProperty, + QgsRectangle, + QgsRenderChecker, + QgsRenderContext, + QgsSimpleFillSymbolLayer, + QgsSingleSymbolRenderer, + QgsSymbol, + QgsSymbolLayer, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest -from qgis.PyQt.QtCore import QDir, QPointF, Qt, QSize -from qgis.PyQt.QtGui import QImage, QColor, QPainter - -from qgis.core import (QgsGeometry, - QgsFillSymbol, - QgsRenderContext, - QgsFeature, - QgsMapSettings, - QgsRenderChecker, - QgsVectorLayer, - QgsSimpleFillSymbolLayer, - QgsSymbolLayer, - QgsProperty, - QgsSingleSymbolRenderer, - QgsRectangle, - QgsMultiRenderChecker, - QgsSymbol - ) - -from qgis.testing import unittest, start_app +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgssimplelinesymbollayer.py b/tests/src/python/test_qgssimplelinesymbollayer.py index 31f983bbf86e..06bba05a088f 100644 --- a/tests/src/python/test_qgssimplelinesymbollayer.py +++ b/tests/src/python/test_qgssimplelinesymbollayer.py @@ -19,39 +19,37 @@ __date__ = 'November 2018' __copyright__ = '(C) 2018, Nyall Dawson' -import qgis # NOQA - import os -from utilities import unitTestDataPath - -from qgis.PyQt.QtCore import QDir, Qt, QSize -from qgis.PyQt.QtGui import QImage, QColor, QPainter +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QSize, Qt +from qgis.PyQt.QtGui import QColor, QImage, QPainter from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsFeature, + QgsFillSymbol, + QgsGeometry, + QgsLineSymbol, + QgsLineSymbolLayer, + QgsMapSettings, + QgsMapUnitScale, + QgsMultiRenderChecker, + QgsProperty, + QgsReadWriteContext, + QgsRectangle, + QgsRenderChecker, + QgsRenderContext, + QgsSimpleLineSymbolLayer, + QgsSingleSymbolRenderer, + QgsSymbol, + QgsSymbolLayer, + QgsSymbolLayerUtils, + QgsUnitTypes, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest -from qgis.core import (QgsGeometry, - QgsRectangle, - QgsFillSymbol, - QgsRenderContext, - QgsFeature, - QgsMapSettings, - QgsRenderChecker, - QgsReadWriteContext, - QgsSymbolLayerUtils, - QgsSimpleLineSymbolLayer, - QgsLineSymbolLayer, - QgsLineSymbol, - QgsUnitTypes, - QgsMapUnitScale, - QgsVectorLayer, - QgsSymbolLayer, - QgsMultiRenderChecker, - QgsProperty, - QgsSingleSymbolRenderer, - QgsSymbol - ) - -from qgis.testing import unittest, start_app +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgssingleitemmodel.py b/tests/src/python/test_qgssingleitemmodel.py index 9664161477a2..4c1de5c77930 100644 --- a/tests/src/python/test_qgssingleitemmodel.py +++ b/tests/src/python/test_qgssingleitemmodel.py @@ -10,21 +10,9 @@ __copyright__ = 'Copyright 2022, The QGIS Project' import qgis # NOQA - -from qgis.PyQt.QtCore import ( - QDir, - QEvent, - Qt, - QPoint, - QPointF -) -from qgis.PyQt.QtGui import ( - QColor -) - -from qgis.core import ( - QgsSingleItemModel -) +from qgis.PyQt.QtCore import Qt +from qgis.PyQt.QtGui import QColor +from qgis.core import QgsSingleItemModel from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgssinglesymbolrenderer.py b/tests/src/python/test_qgssinglesymbolrenderer.py index 81460419d60f..433da0baf34c 100644 --- a/tests/src/python/test_qgssinglesymbolrenderer.py +++ b/tests/src/python/test_qgssinglesymbolrenderer.py @@ -22,23 +22,23 @@ __date__ = 'December 2015' __copyright__ = '(C) 2015, Matthias Kuhn' -import qgis # NOQA - import os +import qgis # NOQA from qgis.PyQt.QtCore import QSize - -from qgis.core import (QgsVectorLayer, - QgsProject, - QgsRectangle, - QgsMultiRenderChecker, - QgsSingleSymbolRenderer, - QgsFillSymbol, - QgsFeatureRequest, - QgsRenderContext - ) +from qgis.core import ( + QgsFeatureRequest, + QgsFillSymbol, + QgsMultiRenderChecker, + QgsProject, + QgsRectangle, + QgsRenderContext, + QgsSingleSymbolRenderer, + QgsVectorLayer, +) from qgis.testing import unittest from qgis.testing.mocked import get_iface + from utilities import unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgssourceselectprovider.py b/tests/src/python/test_qgssourceselectprovider.py index e6c454e798d6..0b30f90a4811 100644 --- a/tests/src/python/test_qgssourceselectprovider.py +++ b/tests/src/python/test_qgssourceselectprovider.py @@ -10,12 +10,14 @@ (at your option) any later version. """ -import os -import tempfile -from qgis.gui import (QgsGui, QgsSourceSelectProvider, QgsSourceSelectProviderRegistry, QgsAbstractDataSourceWidget) -from qgis.testing import start_app, unittest from qgis.PyQt.QtGui import QIcon -from qgis.PyQt.QtWidgets import QWidget +from qgis.gui import ( + QgsAbstractDataSourceWidget, + QgsGui, + QgsSourceSelectProvider, + QgsSourceSelectProviderRegistry, +) +from qgis.testing import start_app, unittest __author__ = 'Alessandro Pasotti' __date__ = '01/09/2017' diff --git a/tests/src/python/test_qgssourcewidgetproviderregistry.py b/tests/src/python/test_qgssourcewidgetproviderregistry.py index f45ca78dafea..0afd075d7f3d 100644 --- a/tests/src/python/test_qgssourcewidgetproviderregistry.py +++ b/tests/src/python/test_qgssourcewidgetproviderregistry.py @@ -12,10 +12,11 @@ import qgis # NOQA from qgis.core import QgsVectorLayer -from qgis.gui import (QgsGui, - QgsQueryBuilder, - QgsProviderSourceWidget, - QgsProviderSourceWidgetProvider) +from qgis.gui import ( + QgsGui, + QgsProviderSourceWidget, + QgsProviderSourceWidgetProvider, +) from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgsspatialindex.py b/tests/src/python/test_qgsspatialindex.py index 7c791bdec8ae..7e787c28b209 100644 --- a/tests/src/python/test_qgsspatialindex.py +++ b/tests/src/python/test_qgsspatialindex.py @@ -11,12 +11,13 @@ import qgis # NOQA -from qgis.core import (QgsSpatialIndex, - QgsFeature, - QgsGeometry, - QgsRectangle, - QgsPointXY) - +from qgis.core import ( + QgsFeature, + QgsGeometry, + QgsPointXY, + QgsRectangle, + QgsSpatialIndex, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgssqlstatement.py b/tests/src/python/test_qgssqlstatement.py index 4f4bb3ba362f..9bc5c3afe001 100644 --- a/tests/src/python/test_qgssqlstatement.py +++ b/tests/src/python/test_qgssqlstatement.py @@ -9,8 +9,8 @@ __date__ = '4/4/2016' __copyright__ = 'Copyright 2016, The QGIS Project' -from qgis.testing import unittest from qgis.core import QgsSQLStatement, QgsSQLStatementFragment +from qgis.testing import unittest class TestQgsSQLStatementCustomFunctions(unittest.TestCase): diff --git a/tests/src/python/test_qgsstringstatisticalsummary.py b/tests/src/python/test_qgsstringstatisticalsummary.py index 592516355436..1b26f96e1b7f 100644 --- a/tests/src/python/test_qgsstringstatisticalsummary.py +++ b/tests/src/python/test_qgsstringstatisticalsummary.py @@ -11,8 +11,7 @@ import qgis # NOQA -from qgis.core import (QgsStringStatisticalSummary - ) +from qgis.core import QgsStringStatisticalSummary from qgis.testing import unittest diff --git a/tests/src/python/test_qgsstringutils.py b/tests/src/python/test_qgsstringutils.py index a67b0eb2fc47..8b541e58ba81 100644 --- a/tests/src/python/test_qgsstringutils.py +++ b/tests/src/python/test_qgsstringutils.py @@ -10,13 +10,12 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - from qgis.PyQt.QtXml import QDomDocument - -from qgis.core import (QgsStringUtils, - QgsStringReplacement, - QgsStringReplacementCollection - ) +from qgis.core import ( + QgsStringReplacement, + QgsStringReplacementCollection, + QgsStringUtils, +) from qgis.testing import unittest diff --git a/tests/src/python/test_qgsstylemodel.py b/tests/src/python/test_qgsstylemodel.py index 75c6bf760246..e5002482945e 100644 --- a/tests/src/python/test_qgsstylemodel.py +++ b/tests/src/python/test_qgsstylemodel.py @@ -10,24 +10,25 @@ __copyright__ = 'Copyright 2018, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsSymbol, - QgsFillSymbol, - QgsMarkerSymbol, - QgsLineSymbol, - QgsLimitedRandomColorRamp, - QgsStyleModel, - QgsStyle, - QgsStyleProxyModel, - QgsTextFormat, - QgsPalLayerSettings, - QgsWkbTypes, - QgsLegendPatchShape, - QgsGeometry, - QgsAbstract3DSymbol) -from qgis.testing import start_app, unittest -from qgis.PyQt.QtCore import Qt, QSize, QModelIndex +from qgis.PyQt.QtCore import QModelIndex, QSize, Qt from qgis.PyQt.QtGui import QColor +from qgis.core import ( + QgsAbstract3DSymbol, + QgsFillSymbol, + QgsGeometry, + QgsLegendPatchShape, + QgsLimitedRandomColorRamp, + QgsLineSymbol, + QgsMarkerSymbol, + QgsPalLayerSettings, + QgsStyle, + QgsStyleModel, + QgsStyleProxyModel, + QgsSymbol, + QgsTextFormat, + QgsWkbTypes, +) +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgssubsetstringeditorproviderregistry.py b/tests/src/python/test_qgssubsetstringeditorproviderregistry.py index d4b859c25835..c013ed926714 100644 --- a/tests/src/python/test_qgssubsetstringeditorproviderregistry.py +++ b/tests/src/python/test_qgssubsetstringeditorproviderregistry.py @@ -10,15 +10,14 @@ __copyright__ = 'Copyright 2018, The QGIS Project' import qgis # NOQA - from qgis.PyQt.QtCore import Qt -from qgis.PyQt.QtWidgets import QDialog - from qgis.core import QgsVectorLayer -from qgis.gui import (QgsGui, - QgsQueryBuilder, - QgsSubsetStringEditorInterface, - QgsSubsetStringEditorProvider) +from qgis.gui import ( + QgsGui, + QgsQueryBuilder, + QgsSubsetStringEditorInterface, + QgsSubsetStringEditorProvider, +) from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgssvgcache.py b/tests/src/python/test_qgssvgcache.py index a9ab46beb699..824ac5fa66b5 100644 --- a/tests/src/python/test_qgssvgcache.py +++ b/tests/src/python/test_qgssvgcache.py @@ -9,18 +9,22 @@ __date__ = '29/03/2018' __copyright__ = 'Copyright 2018, The QGIS Project' -import qgis # NOQA - +import http.server import os import socketserver import threading -import http.server import time -from qgis.PyQt.QtCore import QDir, QCoreApplication -from qgis.PyQt.QtGui import QColor, QImage, QPainter -from qgis.core import (QgsSvgCache, QgsRenderChecker, QgsApplication, QgsMultiRenderChecker) +import qgis # NOQA +from qgis.PyQt.QtCore import QCoreApplication, QDir +from qgis.PyQt.QtGui import QColor, QImage, QPainter +from qgis.core import ( + QgsApplication, + QgsMultiRenderChecker, + QgsRenderChecker, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgssvgsourcelineedit.py b/tests/src/python/test_qgssvgsourcelineedit.py index 9b89c282778c..158099c6fcf9 100644 --- a/tests/src/python/test_qgssvgsourcelineedit.py +++ b/tests/src/python/test_qgssvgsourcelineedit.py @@ -9,12 +9,13 @@ __date__ = '19/07/2018' __copyright__ = 'Copyright 2018, The QGIS Project' -import qgis # NOQA import os -from qgis.gui import QgsSvgSourceLineEdit +import qgis # NOQA from qgis.PyQt.QtTest import QSignalSpy +from qgis.gui import QgsSvgSourceLineEdit from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgssymbol.py b/tests/src/python/test_qgssymbol.py index 6a51b9877f27..b441f3c15d58 100644 --- a/tests/src/python/test_qgssymbol.py +++ b/tests/src/python/test_qgssymbol.py @@ -20,49 +20,47 @@ __copyright__ = '(C) 2016, Nyall Dawson' import qgis # NOQA - -from utilities import unitTestDataPath - -from qgis.PyQt.QtCore import QDir, Qt, QSize -from qgis.PyQt.QtGui import QImage, QColor, QPainter +from qgis.PyQt.QtCore import QDir, QSize, Qt +from qgis.PyQt.QtGui import QColor, QImage, QPainter from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + Qgis, + QgsArrowSymbolLayer, + QgsCoordinateReferenceSystem, + QgsCoordinateTransform, + QgsFeature, + QgsFillSymbol, + QgsGeometry, + QgsGeometryGeneratorSymbolLayer, + QgsLineString, + QgsLineSymbol, + QgsMapSettings, + QgsMapUnitScale, + QgsMarkerLineSymbolLayer, + QgsMarkerSymbol, + QgsMultiPolygon, + QgsPoint, + QgsPolygon, + QgsProject, + QgsProperty, + QgsRasterFillSymbolLayer, + QgsReadWriteContext, + QgsRectangle, + QgsRenderChecker, + QgsRenderContext, + QgsSimpleFillSymbolLayer, + QgsSimpleLineSymbolLayer, + QgsSimpleMarkerSymbolLayer, + QgsSimpleMarkerSymbolLayerBase, + QgsSymbol, + QgsSymbolLayer, + QgsSymbolLayerUtils, + QgsUnitTypes, + QgsWkbTypes, +) +from qgis.testing import start_app, unittest -from qgis.core import (QgsGeometry, - QgsRectangle, - QgsCoordinateTransform, - QgsCoordinateReferenceSystem, - QgsMapUnitScale, - QgsMarkerSymbol, - QgsMultiPolygon, - QgsPolygon, - QgsLineString, - QgsFillSymbol, - QgsLineSymbol, - QgsRenderContext, - QgsFeature, - QgsMapSettings, - QgsRenderChecker, - QgsSimpleMarkerSymbolLayer, - QgsSimpleMarkerSymbolLayerBase, - QgsSimpleLineSymbolLayer, - QgsSimpleFillSymbolLayer, - QgsUnitTypes, - QgsWkbTypes, - QgsProject, - QgsReadWriteContext, - QgsSymbolLayerUtils, - QgsMarkerLineSymbolLayer, - QgsArrowSymbolLayer, - QgsGeometryGeneratorSymbolLayer, - QgsSymbol, - Qgis, - QgsSymbolLayer, - QgsProperty, - QgsRasterFillSymbolLayer, - QgsPoint - ) - -from qgis.testing import unittest, start_app +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgssymbolbutton.py b/tests/src/python/test_qgssymbolbutton.py index d7b464d71b5c..166fece0ade2 100644 --- a/tests/src/python/test_qgssymbolbutton.py +++ b/tests/src/python/test_qgssymbolbutton.py @@ -10,13 +10,11 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtGui import QColor +from qgis.PyQt.QtTest import QSignalSpy from qgis.core import QgsFillSymbol, QgsMarkerSymbol, QgsSymbol -from qgis.gui import QgsSymbolButton, QgsMapCanvas +from qgis.gui import QgsMapCanvas, QgsSymbolButton from qgis.testing import start_app, unittest -from qgis.PyQt.QtGui import QColor, QFont -from qgis.PyQt.QtTest import QSignalSpy -from utilities import getTestFont start_app() diff --git a/tests/src/python/test_qgssymbolexpressionvariables.py b/tests/src/python/test_qgssymbolexpressionvariables.py index cbd69f640cf9..7cc2ca444bd0 100644 --- a/tests/src/python/test_qgssymbolexpressionvariables.py +++ b/tests/src/python/test_qgssymbolexpressionvariables.py @@ -19,26 +19,24 @@ __date__ = 'January 2016' __copyright__ = '(C) 2016, Matthiasd Kuhn' -import qgis # NOQA - import os +import qgis # NOQA from qgis.PyQt.QtCore import QSize - from qgis.core import ( - QgsVectorLayer, + QgsFillSymbol, + QgsMultiRenderChecker, QgsProject, + QgsProperty, QgsRectangle, - QgsMultiRenderChecker, - QgsSingleSymbolRenderer, - QgsFillSymbol, QgsRenderContext, - QgsProperty, - QgsSymbolLayer + QgsSingleSymbolRenderer, + QgsSymbolLayer, + QgsVectorLayer, ) - -from qgis.testing import unittest, start_app +from qgis.testing import start_app, unittest from qgis.testing.mocked import get_iface + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgssymbollayer.py b/tests/src/python/test_qgssymbollayer.py index 9c54787ae706..b7468eccbb44 100644 --- a/tests/src/python/test_qgssymbollayer.py +++ b/tests/src/python/test_qgssymbollayer.py @@ -22,62 +22,68 @@ __date__ = 'October 2012' __copyright__ = '(C) 2012, Massimo Endrighi' -import qgis # NOQA - -from osgeo import ogr import os -from qgis.PyQt.Qt import PYQT_VERSION_STR -from qgis.PyQt.QtCore import Qt, QObject, QDir, QFile, QIODevice, QPointF, QSize, QTemporaryDir -from qgis.PyQt.QtXml import QDomDocument +import qgis # NOQA +from osgeo import ogr +from qgis.PyQt.QtCore import ( + QDir, + QFile, + QIODevice, + QObject, + QPointF, + QSize, + Qt, + QTemporaryDir, +) from qgis.PyQt.QtGui import QColor, QImage, QPainter - -from qgis.core import (QgsCentroidFillSymbolLayer, - QgsEllipseSymbolLayer, - QgsFillSymbolLayer, - QgsFontMarkerSymbolLayer, - QgsFilledMarkerSymbolLayer, - QgsGradientFillSymbolLayer, - QgsImageFillSymbolLayer, - QgsLinePatternFillSymbolLayer, - QgsLineSymbolLayer, - QgsMarkerLineSymbolLayer, - QgsMarkerSymbolLayer, - QgsReadWriteContext, - QgsPointPatternFillSymbolLayer, - QgsSimpleFillSymbolLayer, - QgsSimpleLineSymbolLayer, - QgsSimpleMarkerSymbolLayer, - QgsSimpleMarkerSymbolLayerBase, - QgsSVGFillSymbolLayer, - QgsSvgMarkerSymbolLayer, - QgsSymbolLayer, - QgsVectorFieldSymbolLayer, - QgsRasterFillSymbolLayer, - QgsShapeburstFillSymbolLayer, - QgsArrowSymbolLayer, - QgsUnitTypes, - QgsFillSymbol, - QgsLineSymbol, - QgsMarkerSymbol, - QgsSymbolLayerUtils, - QgsMapSettings, - QgsGeometry, - QgsFeature, - QgsRenderContext, - QgsRenderChecker, - QgsRectangle, - QgsVectorLayer, - QgsProject, - QgsMultiRenderChecker, - QgsSingleSymbolRenderer, - QgsProperty, - QgsExpressionContext, - QgsExpressionContextUtils, - QgsCategorizedSymbolRenderer, - QgsRendererCategory, - ) +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + QgsArrowSymbolLayer, + QgsCategorizedSymbolRenderer, + QgsCentroidFillSymbolLayer, + QgsEllipseSymbolLayer, + QgsFeature, + QgsFilledMarkerSymbolLayer, + QgsFillSymbol, + QgsFillSymbolLayer, + QgsFontMarkerSymbolLayer, + QgsGeometry, + QgsGradientFillSymbolLayer, + QgsImageFillSymbolLayer, + QgsLinePatternFillSymbolLayer, + QgsLineSymbol, + QgsLineSymbolLayer, + QgsMapSettings, + QgsMarkerLineSymbolLayer, + QgsMarkerSymbol, + QgsMarkerSymbolLayer, + QgsMultiRenderChecker, + QgsPointPatternFillSymbolLayer, + QgsProject, + QgsProperty, + QgsRasterFillSymbolLayer, + QgsReadWriteContext, + QgsRectangle, + QgsRenderChecker, + QgsRenderContext, + QgsRendererCategory, + QgsShapeburstFillSymbolLayer, + QgsSimpleFillSymbolLayer, + QgsSimpleLineSymbolLayer, + QgsSimpleMarkerSymbolLayer, + QgsSimpleMarkerSymbolLayerBase, + QgsSingleSymbolRenderer, + QgsSVGFillSymbolLayer, + QgsSvgMarkerSymbolLayer, + QgsSymbolLayer, + QgsSymbolLayerUtils, + QgsUnitTypes, + QgsVectorFieldSymbolLayer, + QgsVectorLayer, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath # Convenience instances in case you may need them diff --git a/tests/src/python/test_qgssymbollayer_createsld.py b/tests/src/python/test_qgssymbollayer_createsld.py index a644ff95762a..9dcc1936cd3a 100644 --- a/tests/src/python/test_qgssymbollayer_createsld.py +++ b/tests/src/python/test_qgssymbollayer_createsld.py @@ -19,21 +19,48 @@ __date__ = 'July 2016' __copyright__ = '(C) 2012, Andrea Aime' -import qgis # NOQA import os -from qgis.PyQt.QtCore import Qt, QDir, QFile, QIODevice, QPointF, QSizeF, QTemporaryDir -from qgis.PyQt.QtXml import QDomDocument -from qgis.PyQt.QtGui import QColor, QFont, QImage +import qgis # NOQA +from qgis.PyQt.QtCore import ( + QDir, + QFile, + QIODevice, + QPointF, + QSizeF, + Qt, + QTemporaryDir, +) +from qgis.PyQt.QtGui import QColor, QFont, QImage +from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( Qgis, - QgsSimpleMarkerSymbolLayerBase, QgsUnitTypes, QgsSvgMarkerSymbolLayer, - QgsFontMarkerSymbolLayer, QgsEllipseSymbolLayer, QgsSimpleLineSymbolLayer, - QgsMarkerLineSymbolLayer, QgsMarkerSymbol, QgsSimpleFillSymbolLayer, QgsSVGFillSymbolLayer, - QgsLinePatternFillSymbolLayer, QgsPointPatternFillSymbolLayer, QgsVectorLayer, QgsVectorLayerSimpleLabeling, - QgsTextBufferSettings, QgsPalLayerSettings, QgsTextBackgroundSettings, QgsRuleBasedLabeling, - QgsLineSymbol, QgsSymbolLayer, QgsSimpleMarkerSymbolLayer, QgsProperty, QgsSldExportContext) + QgsEllipseSymbolLayer, + QgsFontMarkerSymbolLayer, + QgsLinePatternFillSymbolLayer, + QgsLineSymbol, + QgsMarkerLineSymbolLayer, + QgsMarkerSymbol, + QgsPalLayerSettings, + QgsPointPatternFillSymbolLayer, + QgsProperty, + QgsRuleBasedLabeling, + QgsSimpleFillSymbolLayer, + QgsSimpleLineSymbolLayer, + QgsSimpleMarkerSymbolLayer, + QgsSimpleMarkerSymbolLayerBase, + QgsSldExportContext, + QgsSVGFillSymbolLayer, + QgsSvgMarkerSymbolLayer, + QgsSymbolLayer, + QgsTextBackgroundSettings, + QgsTextBufferSettings, + QgsUnitTypes, + QgsVectorLayer, + QgsVectorLayerSimpleLabeling, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath # Convenience instances in case you may need them diff --git a/tests/src/python/test_qgssymbollayer_readsld.py b/tests/src/python/test_qgssymbollayer_readsld.py index 1a69d65091ac..fafce05207eb 100644 --- a/tests/src/python/test_qgssymbollayer_readsld.py +++ b/tests/src/python/test_qgssymbollayer_readsld.py @@ -19,30 +19,32 @@ __date__ = 'January 2017' __copyright__ = '(C) 2017, Jorge Gustavo Rocha' -import qgis # NOQA - import os -from qgis.PyQt.QtXml import QDomDocument + +import qgis # NOQA from qgis.PyQt.QtCore import QTemporaryDir +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + Qgis, + QgsEllipseSymbolLayer, + QgsFeature, + QgsFontMarkerSymbolLayer, + QgsGeometry, + QgsLinePatternFillSymbolLayer, + QgsMarkerLineSymbolLayer, + QgsPointXY, + QgsSimpleFillSymbolLayer, + QgsSimpleLineSymbolLayer, + QgsSimpleMarkerSymbolLayer, + QgsSVGFillSymbolLayer, + QgsSvgMarkerSymbolLayer, + QgsSymbol, + QgsUnitTypes, + QgsVectorLayer, +) from qgis.testing import start_app, unittest -from qgis.core import (Qgis, - QgsVectorLayer, - QgsFeature, - QgsGeometry, - QgsUnitTypes, - QgsPointXY, - QgsSymbol, - QgsEllipseSymbolLayer, - QgsSimpleFillSymbolLayer, - QgsSVGFillSymbolLayer, - QgsSvgMarkerSymbolLayer, - QgsLinePatternFillSymbolLayer, - QgsSimpleLineSymbolLayer, - QgsMarkerLineSymbolLayer, - QgsSimpleMarkerSymbolLayer, - QgsFontMarkerSymbolLayer - ) from qgis.testing.mocked import get_iface + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgssymbollayerregistry.py b/tests/src/python/test_qgssymbollayerregistry.py index 05862e61cdcd..a526cf44e2ae 100644 --- a/tests/src/python/test_qgssymbollayerregistry.py +++ b/tests/src/python/test_qgssymbollayerregistry.py @@ -10,10 +10,15 @@ __copyright__ = 'Copyright 2015, The QGIS Project' import qgis # NOQA -from qgis.core import Qgis, QgsApplication, QgsSymbolLayerAbstractMetadata, QgsSymbolLayer, QgsSimpleMarkerSymbolLayer -from qgis.testing import start_app, unittest from qgis.PyQt import sip - +from qgis.core import ( + Qgis, + QgsApplication, + QgsSimpleMarkerSymbolLayer, + QgsSymbolLayer, + QgsSymbolLayerAbstractMetadata, +) +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgssymbollayerutils.py b/tests/src/python/test_qgssymbollayerutils.py index e3c603d0725d..996b115e47a3 100644 --- a/tests/src/python/test_qgssymbollayerutils.py +++ b/tests/src/python/test_qgssymbollayerutils.py @@ -9,40 +9,30 @@ __date__ = '2016-09' __copyright__ = 'Copyright 2016, The QGIS Project' -import qgis # NOQA import math -from qgis.PyQt.QtCore import ( - QSizeF, - QPointF, - QMimeData, - QDir, - QSize, - Qt -) -from qgis.PyQt.QtGui import ( - QColor, - QPolygonF, - QImage -) + +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QMimeData, QPointF, QSize, QSizeF, Qt +from qgis.PyQt.QtGui import QColor, QImage, QPolygonF from qgis.core import ( - QgsSymbolLayerUtils, - QgsMarkerSymbol, + Qgis, + QgsAnimatedMarkerSymbolLayer, QgsArrowSymbolLayer, - QgsUnitTypes, - QgsRenderChecker, QgsGradientColorRamp, - QgsShapeburstFillSymbolLayer, + QgsMapUnitScale, QgsMarkerLineSymbolLayer, - QgsSimpleLineSymbolLayer, - QgsSimpleFillSymbolLayer, - QgsSymbolLayer, + QgsMarkerSymbol, QgsProperty, - QgsMapUnitScale, - Qgis, + QgsRenderChecker, + QgsShapeburstFillSymbolLayer, + QgsSimpleFillSymbolLayer, + QgsSimpleLineSymbolLayer, QgsSingleSymbolRenderer, - QgsAnimatedMarkerSymbolLayer, + QgsSymbolLayer, + QgsSymbolLayerUtils, + QgsUnitTypes, ) -from qgis.testing import unittest, start_app +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgstablecell.py b/tests/src/python/test_qgstablecell.py index b68ee7375885..a96612882fec 100644 --- a/tests/src/python/test_qgstablecell.py +++ b/tests/src/python/test_qgstablecell.py @@ -10,14 +10,15 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA -from qgis.core import (QgsTableCell, - QgsBearingNumericFormat, - QgsReadWriteContext, - QgsTextFormat) - from qgis.PyQt.QtGui import QColor - +from qgis.core import ( + QgsBearingNumericFormat, + QgsReadWriteContext, + QgsTableCell, + QgsTextFormat, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgstabwidget.py b/tests/src/python/test_qgstabwidget.py index 75e2df109328..38a5d548bc14 100644 --- a/tests/src/python/test_qgstabwidget.py +++ b/tests/src/python/test_qgstabwidget.py @@ -15,10 +15,9 @@ ''' import qgis # NOQA - -from qgis.testing import unittest, start_app -from qgis.gui import QgsTabWidget from qgis.PyQt.QtWidgets import QWidget +from qgis.gui import QgsTabWidget +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgstaskmanager.py b/tests/src/python/test_qgstaskmanager.py index 0bde4664fc0a..5d7a4996cdaf 100644 --- a/tests/src/python/test_qgstaskmanager.py +++ b/tests/src/python/test_qgstaskmanager.py @@ -13,12 +13,9 @@ from time import sleep import qgis # NOQA - -from qgis.core import QgsTask, QgsApplication - from qgis.PyQt.QtCore import QCoreApplication from qgis.PyQt.QtTest import QSignalSpy - +from qgis.core import QgsApplication, QgsTask from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgstemporalutils.py b/tests/src/python/test_qgstemporalutils.py index a999f7de58de..1e37b068706f 100644 --- a/tests/src/python/test_qgstemporalutils.py +++ b/tests/src/python/test_qgstemporalutils.py @@ -10,22 +10,19 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsProject, - QgsTemporalUtils, - QgsRasterLayer, - QgsDateTimeRange, - QgsInterval, - QgsUnitTypes, - QgsRasterLayerTemporalProperties) - -from qgis.PyQt.QtCore import (QDate, - QTime, - QDateTime, - Qt) - +from qgis.PyQt.QtCore import QDate, QDateTime, Qt, QTime +from qgis.core import ( + QgsDateTimeRange, + QgsInterval, + QgsProject, + QgsRasterLayer, + QgsRasterLayerTemporalProperties, + QgsTemporalUtils, + QgsUnitTypes, +) from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath) + +from utilities import unitTestDataPath app = start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsterrainprovider.py b/tests/src/python/test_qgsterrainprovider.py index 3230b4a1d55f..7337be06be1a 100644 --- a/tests/src/python/test_qgsterrainprovider.py +++ b/tests/src/python/test_qgsterrainprovider.py @@ -9,22 +9,20 @@ __date__ = '17/03/2022' __copyright__ = 'Copyright 2022, The QGIS Project' -import os import math +import os import qgis # NOQA - from qgis.PyQt.QtXml import QDomDocument - from qgis.core import ( + QgsCoordinateReferenceSystem, QgsFlatTerrainProvider, - QgsRasterDemTerrainProvider, + QgsMeshLayer, QgsMeshTerrainProvider, QgsProject, + QgsRasterDemTerrainProvider, QgsRasterLayer, - QgsMeshLayer, QgsReadWriteContext, - QgsCoordinateReferenceSystem ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgstextblock.py b/tests/src/python/test_qgstextblock.py index adc5f78753e9..fd53295fbdbc 100644 --- a/tests/src/python/test_qgstextblock.py +++ b/tests/src/python/test_qgstextblock.py @@ -13,11 +13,7 @@ import qgis # NOQA -from qgis.core import ( - QgsTextBlock, - QgsTextFragment, - QgsStringUtils -) +from qgis.core import QgsStringUtils, QgsTextBlock, QgsTextFragment from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgstextcharacterformat.py b/tests/src/python/test_qgstextcharacterformat.py index 7db0305b2b27..b10398dd6b79 100644 --- a/tests/src/python/test_qgstextcharacterformat.py +++ b/tests/src/python/test_qgstextcharacterformat.py @@ -12,14 +12,13 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtGui import QColor from qgis.core import ( Qgis, QgsFontUtils, + QgsRenderContext, QgsTextCharacterFormat, - QgsRenderContext ) -from qgis.PyQt.QtGui import QColor from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgstextdocument.py b/tests/src/python/test_qgstextdocument.py index 474b6d25c517..47d32a737f61 100644 --- a/tests/src/python/test_qgstextdocument.py +++ b/tests/src/python/test_qgstextdocument.py @@ -15,11 +15,11 @@ from qgis.core import ( Qgis, - QgsTextDocument, + QgsStringUtils, QgsTextBlock, - QgsTextFragment, QgsTextCharacterFormat, - QgsStringUtils + QgsTextDocument, + QgsTextFragment, ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgstextformatwidget.py b/tests/src/python/test_qgstextformatwidget.py index 3f5c3ae39d89..3e2c7176b824 100644 --- a/tests/src/python/test_qgstextformatwidget.py +++ b/tests/src/python/test_qgstextformatwidget.py @@ -10,22 +10,24 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA +from qgis.PyQt.QtCore import QPointF, QSizeF, Qt +from qgis.PyQt.QtGui import QColor, QPainter +from qgis.core import ( + QgsBlurEffect, + QgsMapUnitScale, + QgsMarkerSymbol, + QgsSymbolLayerId, + QgsSymbolLayerReference, + QgsTextBackgroundSettings, + QgsTextBufferSettings, + QgsTextFormat, + QgsTextMaskSettings, + QgsTextShadowSettings, + QgsUnitTypes, +) +from qgis.gui import QgsTextFormatDialog, QgsTextFormatWidget +from qgis.testing import start_app, unittest -from qgis.core import (QgsTextBufferSettings, - QgsTextMaskSettings, - QgsTextBackgroundSettings, - QgsTextShadowSettings, - QgsTextFormat, - QgsUnitTypes, - QgsMapUnitScale, - QgsBlurEffect, - QgsMarkerSymbol, - QgsSymbolLayerReference, - QgsSymbolLayerId) -from qgis.gui import (QgsTextFormatWidget, QgsTextFormatDialog) -from qgis.PyQt.QtGui import (QColor, QPainter) -from qgis.PyQt.QtCore import (Qt, QSizeF, QPointF) -from qgis.testing import unittest, start_app from utilities import getTestFont start_app() diff --git a/tests/src/python/test_qgstextfragment.py b/tests/src/python/test_qgstextfragment.py index 543bd1f2445c..ce106af58ab8 100644 --- a/tests/src/python/test_qgstextfragment.py +++ b/tests/src/python/test_qgstextfragment.py @@ -12,13 +12,8 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.core import ( - QgsTextFragment, - QgsTextCharacterFormat, - QgsStringUtils -) from qgis.PyQt.QtGui import QColor +from qgis.core import QgsStringUtils, QgsTextCharacterFormat, QgsTextFragment from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgstextrenderer.py b/tests/src/python/test_qgstextrenderer.py index 1f9a351aa23d..b23f035405b6 100644 --- a/tests/src/python/test_qgstextrenderer.py +++ b/tests/src/python/test_qgstextrenderer.py @@ -13,37 +13,47 @@ import qgis # NOQA from PyQt5.QtSvg import QSvgGenerator -from qgis.PyQt.QtCore import (Qt, QT_VERSION_STR, QSizeF, QPointF, QRectF, QDir, QSize) -from qgis.PyQt.QtGui import (QColor, QPainter, QFont, QImage, QBrush, QPen) +from qgis.PyQt.QtCore import ( + QT_VERSION_STR, + QDir, + QPointF, + QRectF, + QSize, + QSizeF, + Qt, +) +from qgis.PyQt.QtGui import QBrush, QColor, QFont, QImage, QPainter, QPen from qgis.PyQt.QtXml import QDomDocument -from qgis.core import (Qgis, - QgsTextBufferSettings, - QgsTextMaskSettings, - QgsTextBackgroundSettings, - QgsTextShadowSettings, - QgsTextFormat, - QgsUnitTypes, - QgsMapUnitScale, - QgsVectorLayer, - QgsTextRenderer, - QgsMapSettings, - QgsReadWriteContext, - QgsRenderContext, - QgsRectangle, - QgsRenderChecker, - QgsBlurEffect, - QgsMarkerSymbol, - QgsFillSymbol, - QgsSimpleFillSymbolLayer, - QgsPalLayerSettings, - QgsProperty, - QgsFontUtils, - QgsSymbolLayerId, - QgsSymbolLayerReference, - QgsStringUtils, - QgsTextDocument, - QgsTextDocumentMetrics) -from qgis.testing import unittest, start_app +from qgis.core import ( + Qgis, + QgsBlurEffect, + QgsFillSymbol, + QgsFontUtils, + QgsMapSettings, + QgsMapUnitScale, + QgsMarkerSymbol, + QgsPalLayerSettings, + QgsProperty, + QgsReadWriteContext, + QgsRectangle, + QgsRenderChecker, + QgsRenderContext, + QgsSimpleFillSymbolLayer, + QgsStringUtils, + QgsSymbolLayerId, + QgsSymbolLayerReference, + QgsTextBackgroundSettings, + QgsTextBufferSettings, + QgsTextDocument, + QgsTextDocumentMetrics, + QgsTextFormat, + QgsTextMaskSettings, + QgsTextRenderer, + QgsTextShadowSettings, + QgsUnitTypes, + QgsVectorLayer, +) +from qgis.testing import start_app, unittest from utilities import getTestFont, svgSymbolsPath diff --git a/tests/src/python/test_qgstiles.py b/tests/src/python/test_qgstiles.py index 71e1ea41b323..7b01b742b728 100644 --- a/tests/src/python/test_qgstiles.py +++ b/tests/src/python/test_qgstiles.py @@ -13,16 +13,16 @@ from qgis.PyQt.QtCore import QSize from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( - QgsTileXYZ, - QgsTileRange, - QgsTileMatrix, + Qgis, QgsCoordinateReferenceSystem, QgsPointXY, - QgsTileMatrixSet, - QgsVectorTileMatrixSet, QgsReadWriteContext, - Qgis, QgsRectangle, + QgsTileMatrix, + QgsTileMatrixSet, + QgsTileRange, + QgsTileXYZ, + QgsVectorTileMatrixSet, ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsunittypes.py b/tests/src/python/test_qgsunittypes.py index 3d8403759390..f436d3fa8c77 100644 --- a/tests/src/python/test_qgsunittypes.py +++ b/tests/src/python/test_qgsunittypes.py @@ -10,10 +10,9 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA - -from qgis.testing import unittest -from qgis.core import QgsUnitTypes from qgis.PyQt.QtCore import QLocale +from qgis.core import QgsUnitTypes +from qgis.testing import unittest class TestQgsUnitTypes(unittest.TestCase): diff --git a/tests/src/python/test_qgsunsetattributevalue.py b/tests/src/python/test_qgsunsetattributevalue.py index 1e096daac0ab..a600b1250514 100644 --- a/tests/src/python/test_qgsunsetattributevalue.py +++ b/tests/src/python/test_qgsunsetattributevalue.py @@ -12,20 +12,10 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA -from qgis.PyQt.QtCore import (QSize, - QDir, - QTemporaryDir) -from qgis.PyQt.QtGui import (QImage, - QPainter, - QColor) -from qgis.PyQt.QtXml import QDomDocument -from qgis.core import ( - QgsUnsetAttributeValue, - QgsFeature -) +from qgis.core import QgsUnsetAttributeValue from qgis.testing import start_app, unittest -from utilities import unitTestDataPath, compareWkt +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsvaliditychecks.py b/tests/src/python/test_qgsvaliditychecks.py index a0304c91e3eb..e46d4a7086e8 100644 --- a/tests/src/python/test_qgsvaliditychecks.py +++ b/tests/src/python/test_qgsvaliditychecks.py @@ -11,13 +11,15 @@ import qgis # NOQA -from qgis.core import (QgsApplication, - QgsAbstractValidityCheck, - QgsValidityCheckRegistry, - QgsValidityCheckResult, - QgsValidityCheckContext, - QgsFeedback, - check) +from qgis.core import ( + QgsAbstractValidityCheck, + QgsApplication, + QgsFeedback, + QgsValidityCheckContext, + QgsValidityCheckRegistry, + QgsValidityCheckResult, + check, +) from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgsvectorfieldmarkersymbollayer.py b/tests/src/python/test_qgsvectorfieldmarkersymbollayer.py index 54bb5406e810..e8fe0bb05239 100644 --- a/tests/src/python/test_qgsvectorfieldmarkersymbollayer.py +++ b/tests/src/python/test_qgsvectorfieldmarkersymbollayer.py @@ -21,24 +21,20 @@ import qgis # NOQA from qgis.PyQt.QtCore import QDir, QVariant -from qgis.PyQt.QtGui import QImage, QColor, QPainter -from qgis.PyQt.QtXml import QDomDocument -from qgis.core import (QgsGeometry, - QgsFields, - QgsField, - QgsRenderContext, - QgsFeature, - QgsMapSettings, - QgsRenderChecker, - QgsReadWriteContext, - QgsSymbolLayerUtils, - QgsSimpleMarkerSymbolLayer, - QgsLineSymbolLayer, - QgsLineSymbol, - QgsMarkerSymbol, - QgsVectorFieldSymbolLayer - ) -from qgis.testing import unittest, start_app +from qgis.PyQt.QtGui import QColor, QImage, QPainter +from qgis.core import ( + QgsFeature, + QgsField, + QgsFields, + QgsGeometry, + QgsLineSymbol, + QgsMapSettings, + QgsMarkerSymbol, + QgsRenderChecker, + QgsRenderContext, + QgsVectorFieldSymbolLayer, +) +from qgis.testing import start_app, unittest from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsvectorfilewriter.py b/tests/src/python/test_qgsvectorfilewriter.py index ee475dbfd5aa..d3f520dd26ae 100644 --- a/tests/src/python/test_qgsvectorfilewriter.py +++ b/tests/src/python/test_qgsvectorfilewriter.py @@ -10,38 +10,48 @@ __date__ = '20/08/2012' __copyright__ = 'Copyright 2012, The QGIS Project' -import qgis # NOQA - -from qgis.core import (QgsVectorLayer, - QgsFeature, - QgsField, - QgsGeometry, - QgsPointXY, - QgsCoordinateReferenceSystem, - QgsVectorFileWriter, - QgsFeatureRequest, - QgsProject, - QgsWkbTypes, - QgsRectangle, - QgsCoordinateTransform, - QgsMultiPolygon, - QgsTriangle, - QgsPoint, - QgsFields, - QgsCoordinateTransformContext, - QgsFeatureSink, - QgsMemoryProviderUtils, - QgsLayerMetadata, - QgsUnsetAttributeValue, - NULL - ) -from qgis.PyQt.QtCore import QDate, QTime, QDateTime, QVariant, QDir, QByteArray, QTemporaryDir import os import tempfile + import osgeo.gdal # NOQA +import qgis # NOQA from osgeo import gdal, ogr +from qgis.PyQt.QtCore import ( + QByteArray, + QDate, + QDateTime, + QDir, + QTemporaryDir, + QTime, + QVariant, +) +from qgis.core import ( + NULL, + QgsCoordinateReferenceSystem, + QgsCoordinateTransform, + QgsCoordinateTransformContext, + QgsFeature, + QgsFeatureRequest, + QgsFeatureSink, + QgsField, + QgsFields, + QgsGeometry, + QgsLayerMetadata, + QgsMemoryProviderUtils, + QgsMultiPolygon, + QgsPoint, + QgsPointXY, + QgsProject, + QgsRectangle, + QgsTriangle, + QgsUnsetAttributeValue, + QgsVectorFileWriter, + QgsVectorLayer, + QgsWkbTypes, +) from qgis.testing import start_app, unittest -from utilities import writeShape, compareWkt, unitTestDataPath + +from utilities import compareWkt, unitTestDataPath, writeShape TEST_DATA_DIR = unitTestDataPath() start_app() diff --git a/tests/src/python/test_qgsvectorfilewriter_postgres.py b/tests/src/python/test_qgsvectorfilewriter_postgres.py index 753790feeef3..61b35748dd95 100644 --- a/tests/src/python/test_qgsvectorfilewriter_postgres.py +++ b/tests/src/python/test_qgsvectorfilewriter_postgres.py @@ -10,14 +10,17 @@ __date__ = '22/03/2021' __copyright__ = 'Copyright 2021, The QGIS Project' -import qgis # NOQA - -from qgis.core import (QgsVectorLayer, - QgsCoordinateReferenceSystem, - QgsVectorFileWriter) -from qgis.PyQt.QtCore import QVariant, QDir import os + +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QVariant +from qgis.core import ( + QgsCoordinateReferenceSystem, + QgsVectorFileWriter, + QgsVectorLayer, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsvectorfilewritertask.py b/tests/src/python/test_qgsvectorfilewritertask.py index d176f6f4b96e..9e50be32951b 100644 --- a/tests/src/python/test_qgsvectorfilewritertask.py +++ b/tests/src/python/test_qgsvectorfilewritertask.py @@ -9,19 +9,19 @@ __date__ = '12/02/2017' __copyright__ = 'Copyright 2017, The QGIS Project' -import qgis # NOQA import os +import qgis # NOQA +from qgis.PyQt.QtCore import QCoreApplication, QDir from qgis.core import ( QgsApplication, - QgsVectorLayer, QgsFeature, QgsGeometry, QgsPointXY, QgsVectorFileWriter, - QgsVectorFileWriterTask + QgsVectorFileWriterTask, + QgsVectorLayer, ) -from qgis.PyQt.QtCore import QCoreApplication, QDir from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsvectorlayer.py b/tests/src/python/test_qgsvectorlayer.py index 95fc5dcf704e..be7888ae6b39 100644 --- a/tests/src/python/test_qgsvectorlayer.py +++ b/tests/src/python/test_qgsvectorlayer.py @@ -12,79 +12,78 @@ __date__ = '20/08/2012' __copyright__ = 'Copyright 2012, The QGIS Project' -import qgis # NOQA - +import glob import os -import tempfile import shutil -import glob +import tempfile +import qgis # NOQA from qgis.PyQt.QtCore import ( - QVariant, - Qt, - QDateTime, QDate, + QDateTime, + Qt, + QTemporaryDir, QTime, QTimer, - QTemporaryDir, + QVariant, ) -from qgis.PyQt.QtGui import QPainter, QColor -from qgis.PyQt.QtXml import QDomDocument - -from qgis.core import (Qgis, - QgsWkbTypes, - QgsAction, - QgsAuxiliaryStorage, - QgsCoordinateTransformContext, - QgsDataProvider, - QgsDefaultValue, - QgsEditorWidgetSetup, - QgsMapLayer, - QgsVectorLayer, - QgsRectangle, - QgsFeature, - QgsFeatureRequest, - QgsGeometry, - QgsPointXY, - QgsField, - QgsFieldConstraints, - QgsFields, - QgsVectorLayerJoinInfo, - QgsSymbol, - QgsCoordinateReferenceSystem, - QgsVectorLayerCache, - QgsReadWriteContext, - QgsProject, - QgsUnitTypes, - QgsAggregateCalculator, - QgsPoint, - QgsExpressionContext, - QgsExpressionContextScope, - QgsExpressionContextUtils, - QgsLineSymbol, - QgsMapLayerServerProperties, - QgsMapLayerStyle, - QgsMapLayerDependency, - QgsRenderContext, - QgsPalLayerSettings, - QgsVectorLayerSimpleLabeling, - QgsSingleCategoryDiagramRenderer, - QgsDiagramLayerSettings, - QgsTextFormat, - QgsVectorLayerSelectedFeatureSource, - QgsExpression, - QgsLayerMetadata, - QgsAnimatedMarkerSymbolLayer, - QgsMarkerSymbol, - QgsSingleSymbolRenderer, - QgsEmbeddedSymbolRenderer, - QgsNullSymbolRenderer, - NULL) -from qgis.gui import (QgsAttributeTableModel, - QgsGui - ) +from qgis.PyQt.QtGui import QColor, QPainter from qgis.PyQt.QtTest import QSignalSpy +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + NULL, + Qgis, + QgsAction, + QgsAggregateCalculator, + QgsAnimatedMarkerSymbolLayer, + QgsAuxiliaryStorage, + QgsCoordinateReferenceSystem, + QgsCoordinateTransformContext, + QgsDataProvider, + QgsDefaultValue, + QgsDiagramLayerSettings, + QgsEditorWidgetSetup, + QgsEmbeddedSymbolRenderer, + QgsExpression, + QgsExpressionContext, + QgsExpressionContextScope, + QgsExpressionContextUtils, + QgsFeature, + QgsFeatureRequest, + QgsField, + QgsFieldConstraints, + QgsFields, + QgsGeometry, + QgsLayerMetadata, + QgsLineSymbol, + QgsMapLayer, + QgsMapLayerDependency, + QgsMapLayerServerProperties, + QgsMapLayerStyle, + QgsMarkerSymbol, + QgsNullSymbolRenderer, + QgsPalLayerSettings, + QgsPoint, + QgsPointXY, + QgsProject, + QgsReadWriteContext, + QgsRectangle, + QgsRenderContext, + QgsSingleCategoryDiagramRenderer, + QgsSingleSymbolRenderer, + QgsSymbol, + QgsTextFormat, + QgsUnitTypes, + QgsVectorLayer, + QgsVectorLayerCache, + QgsVectorLayerJoinInfo, + QgsVectorLayerSelectedFeatureSource, + QgsVectorLayerSimpleLabeling, + QgsWkbTypes, +) +from qgis.gui import QgsAttributeTableModel, QgsGui from qgis.testing import start_app, unittest + from featuresourcetestbase import FeatureSourceTestCase from utilities import unitTestDataPath diff --git a/tests/src/python/test_qgsvectorlayer_namedstyle.py b/tests/src/python/test_qgsvectorlayer_namedstyle.py index 350de14ac669..0f958fb5baf2 100644 --- a/tests/src/python/test_qgsvectorlayer_namedstyle.py +++ b/tests/src/python/test_qgsvectorlayer_namedstyle.py @@ -12,14 +12,8 @@ # This will get replaced with a git SHA1 when you do a git archive __revision__ = '$Format:%H$' -import tempfile -from qgis.core import ( - QgsVectorLayer, - QgsMapLayer, - QgsReadWriteContext, -) -from qgis.PyQt.QtXml import QDomDocument, QDomNode - +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import QgsMapLayer, QgsReadWriteContext, QgsVectorLayer from qgis.testing import unittest diff --git a/tests/src/python/test_qgsvectorlayercache.py b/tests/src/python/test_qgsvectorlayercache.py index 7215d86f9eba..dee504e5a064 100644 --- a/tests/src/python/test_qgsvectorlayercache.py +++ b/tests/src/python/test_qgsvectorlayercache.py @@ -10,30 +10,17 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import qgis # NOQA - -import os - -from qgis.PyQt.QtCore import QVariant, Qt, QDateTime, QDate, QTime -from qgis.PyQt.QtGui import QPainter -from qgis.PyQt.QtXml import QDomDocument - -from qgis.core import (QgsWkbTypes, - QgsVectorLayer, - QgsVectorLayerCache, - QgsRectangle, - QgsFeature, - QgsFeatureRequest, - QgsGeometry, - QgsPointXY, - QgsField, - QgsFields, - QgsCoordinateReferenceSystem, - QgsProject, - QgsPoint, - NULL) +from qgis.PyQt.QtCore import QDate, QDateTime, QTime +from qgis.core import ( + NULL, + QgsFeature, + QgsGeometry, + QgsVectorLayer, + QgsVectorLayerCache, +) from qgis.testing import start_app, unittest + from featuresourcetestbase import FeatureSourceTestCase -from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsvectorlayereditbuffer.py b/tests/src/python/test_qgsvectorlayereditbuffer.py index b3f840fb51d2..bd3076d5ad76 100644 --- a/tests/src/python/test_qgsvectorlayereditbuffer.py +++ b/tests/src/python/test_qgsvectorlayereditbuffer.py @@ -10,18 +10,21 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import os + import qgis # NOQA -from qgis.PyQt.QtCore import QVariant, QTemporaryDir +from qgis.PyQt.QtCore import QTemporaryDir, QVariant from qgis.PyQt.QtTest import QSignalSpy -from qgis.core import (Qgis, - QgsVectorLayer, - QgsFeature, - QgsProject, - QgsGeometry, - QgsPointXY, - QgsField, - QgsVectorFileWriter, - QgsCoordinateTransformContext) +from qgis.core import ( + Qgis, + QgsCoordinateTransformContext, + QgsFeature, + QgsField, + QgsGeometry, + QgsPointXY, + QgsProject, + QgsVectorFileWriter, + QgsVectorLayer, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsvectorlayereditbuffergroup.py b/tests/src/python/test_qgsvectorlayereditbuffergroup.py index 6a3821e6644f..8e2d8b0ebf56 100644 --- a/tests/src/python/test_qgsvectorlayereditbuffergroup.py +++ b/tests/src/python/test_qgsvectorlayereditbuffergroup.py @@ -10,16 +10,18 @@ __copyright__ = 'Copyright 2022, The QGIS Project' import os + import qgis # NOQA -from qgis.PyQt.QtCore import QVariant, QTemporaryDir -from qgis.core import (Qgis, - QgsGeometry, - QgsVectorLayer, - QgsFeature, - QgsProject, - QgsField, - QgsVectorFileWriter, - QgsCoordinateTransformContext) +from qgis.PyQt.QtCore import QTemporaryDir +from qgis.core import ( + Qgis, + QgsCoordinateTransformContext, + QgsFeature, + QgsGeometry, + QgsProject, + QgsVectorFileWriter, + QgsVectorLayer, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsvectorlayereditutils.py b/tests/src/python/test_qgsvectorlayereditutils.py index fd346a5c9eeb..bf0b3f998e88 100644 --- a/tests/src/python/test_qgsvectorlayereditutils.py +++ b/tests/src/python/test_qgsvectorlayereditutils.py @@ -12,37 +12,29 @@ __date__ = '18/10/2022' __copyright__ = 'Copyright 2022, The QGIS Project' -import qgis # NOQA - -import tempfile import os +import tempfile +import qgis # NOQA from qgis.PyQt.QtCore import ( QVariant, - Qt, - QDateTime, - QDate, - QTime, - QTimer, - QTemporaryDir, ) - -from qgis.core import (Qgis, - QgsFeature, - QgsField, - QgsFields, - QgsGeometry, - QgsLineString, - QgsPoint, - QgsPointXY, - QgsCoordinateReferenceSystem, - QgsCoordinateTransformContext, - QgsVectorLayer, - QgsVectorLayerEditUtils, - QgsVectorFileWriter, - QgsWkbTypes) - - +from qgis.core import ( + Qgis, + QgsCoordinateReferenceSystem, + QgsCoordinateTransformContext, + QgsFeature, + QgsField, + QgsFields, + QgsGeometry, + QgsLineString, + QgsPoint, + QgsPointXY, + QgsVectorFileWriter, + QgsVectorLayer, + QgsVectorLayerEditUtils, + QgsWkbTypes, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsvectorlayerelevationproperties.py b/tests/src/python/test_qgsvectorlayerelevationproperties.py index dcc5d2e7d484..8e0df5fc045c 100644 --- a/tests/src/python/test_qgsvectorlayerelevationproperties.py +++ b/tests/src/python/test_qgsvectorlayerelevationproperties.py @@ -10,25 +10,23 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - +from qgis.PyQt.QtXml import QDomDocument from qgis.core import ( Qgis, - QgsVectorLayer, - QgsVectorLayerElevationProperties, - QgsReadWriteContext, + QgsFillSymbol, QgsLineSymbol, + QgsMapLayerElevationProperties, QgsMarkerSymbol, - QgsFillSymbol, QgsProperty, - QgsMapLayerElevationProperties, - QgsPropertyCollection + QgsPropertyCollection, + QgsReadWriteContext, + QgsVectorLayer, + QgsVectorLayerElevationProperties, ) -from utilities import unitTestDataPath - -from qgis.PyQt.QtXml import QDomDocument - from qgis.testing import start_app, unittest +from utilities import unitTestDataPath + start_app() diff --git a/tests/src/python/test_qgsvectorlayerfeaturecounter.py b/tests/src/python/test_qgsvectorlayerfeaturecounter.py index c3f0d6157fa8..2c8a35b4ebf9 100644 --- a/tests/src/python/test_qgsvectorlayerfeaturecounter.py +++ b/tests/src/python/test_qgsvectorlayerfeaturecounter.py @@ -10,23 +10,15 @@ __copyright__ = 'Copyright 2021, The QGIS Project' import qgis # NOQA - -import os - -from qgis.PyQt.QtCore import QVariant, Qt, QDateTime, QDate, QTime -from qgis.PyQt.QtGui import QPainter -from qgis.PyQt.QtXml import QDomDocument +from qgis.PyQt.QtCore import QDate, QDateTime, QTime from qgis.PyQt.QtTest import QSignalSpy - -from qgis.core import (QgsWkbTypes, - QgsVectorLayer, - QgsFeature, - QgsGeometry, - QgsField, - QgsFields, - NULL) +from qgis.core import ( + NULL, + QgsFeature, + QgsGeometry, + QgsVectorLayer, +) from qgis.testing import start_app, unittest -from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsvectorlayerprofilegenerator.py b/tests/src/python/test_qgsvectorlayerprofilegenerator.py index af2e004b623b..9e294dab9e3f 100644 --- a/tests/src/python/test_qgsvectorlayerprofilegenerator.py +++ b/tests/src/python/test_qgsvectorlayerprofilegenerator.py @@ -14,31 +14,31 @@ import qgis # NOQA from qgis.PyQt.QtCore import QDir from qgis.core import ( - QgsRasterLayer, - QgsLineString, - QgsProfileRequest, - QgsCoordinateReferenceSystem, - QgsVectorLayer, Qgis, - QgsRasterDemTerrainProvider, - QgsFeature, - QgsGeometry, + QgsCategorizedSymbolRenderer, + QgsCoordinateReferenceSystem, QgsCoordinateTransformContext, - QgsProjUtils, - QgsProfilePlotRenderer, + QgsDoubleRange, + QgsFeature, QgsFillSymbol, - QgsRenderChecker, - QgsCategorizedSymbolRenderer, - QgsRendererCategory, - QgsMapLayerElevationProperties, - QgsProperty, - QgsProfilePoint, - QgsProfileSnapContext, + QgsGeometry, + QgsLineString, QgsLineSymbol, + QgsMapLayerElevationProperties, QgsMarkerSymbol, QgsProfileIdentifyContext, - QgsDoubleRange, - QgsSymbolLayer + QgsProfilePlotRenderer, + QgsProfilePoint, + QgsProfileRequest, + QgsProfileSnapContext, + QgsProjUtils, + QgsProperty, + QgsRasterDemTerrainProvider, + QgsRasterLayer, + QgsRenderChecker, + QgsRendererCategory, + QgsSymbolLayer, + QgsVectorLayer, ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsvectorlayerrenderer.py b/tests/src/python/test_qgsvectorlayerrenderer.py index 967007aa92fb..c56172c76675 100644 --- a/tests/src/python/test_qgsvectorlayerrenderer.py +++ b/tests/src/python/test_qgsvectorlayerrenderer.py @@ -9,31 +9,31 @@ __date__ = '2020-06' __copyright__ = 'Copyright 2020, The QGIS Project' -import qgis # NOQA - import os -from qgis.PyQt.QtCore import QSize, QDir - -from qgis.core import (QgsVectorLayer, - QgsMapClippingRegion, - QgsRectangle, - QgsMultiRenderChecker, - QgsGeometry, - QgsSingleSymbolRenderer, - QgsMapSettings, - QgsFillSymbol, - QgsCoordinateReferenceSystem, - QgsRuleBasedRenderer, - QgsFeatureRendererGenerator, - QgsCategorizedSymbolRenderer, - QgsRendererCategory, - QgsCentroidFillSymbolLayer, - QgsMarkerSymbol, - QgsLineSymbol - ) +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QSize +from qgis.core import ( + QgsCategorizedSymbolRenderer, + QgsCentroidFillSymbolLayer, + QgsCoordinateReferenceSystem, + QgsFeatureRendererGenerator, + QgsFillSymbol, + QgsGeometry, + QgsLineSymbol, + QgsMapClippingRegion, + QgsMapSettings, + QgsMarkerSymbol, + QgsMultiRenderChecker, + QgsRectangle, + QgsRendererCategory, + QgsRuleBasedRenderer, + QgsSingleSymbolRenderer, + QgsVectorLayer, +) from qgis.testing import start_app, unittest -from utilities import (unitTestDataPath) + +from utilities import unitTestDataPath # Convenience instances in case you may need them # not used in this test diff --git a/tests/src/python/test_qgsvectorlayerselectedfeaturesource.py b/tests/src/python/test_qgsvectorlayerselectedfeaturesource.py index cb68dcd6443d..348eb96ef623 100644 --- a/tests/src/python/test_qgsvectorlayerselectedfeaturesource.py +++ b/tests/src/python/test_qgsvectorlayerselectedfeaturesource.py @@ -10,27 +10,19 @@ __copyright__ = 'Copyright 2018, The QGIS Project' +from qgis.PyQt.QtCore import QDate, QDateTime, QTime from qgis.core import ( - QgsVectorLayer, - QgsFeatureRequest, + NULL, QgsFeature, + QgsFeatureRequest, QgsGeometry, - NULL, - QgsVectorLayerSelectedFeatureSource -) - -from qgis.PyQt.QtCore import QDateTime, QDate, QTime - -from qgis.testing import ( - start_app, - unittest -) - -from utilities import ( - unitTestDataPath + QgsVectorLayer, + QgsVectorLayerSelectedFeatureSource, ) +from qgis.testing import start_app, unittest from featuresourcetestbase import FeatureSourceTestCase +from utilities import unitTestDataPath start_app() TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_qgsvectorlayertemporalproperties.py b/tests/src/python/test_qgsvectorlayertemporalproperties.py index 728f4e4e2b64..9a1a7e8d0941 100644 --- a/tests/src/python/test_qgsvectorlayertemporalproperties.py +++ b/tests/src/python/test_qgsvectorlayertemporalproperties.py @@ -10,21 +10,19 @@ __copyright__ = 'Copyright 2020, The QGIS Project' import qgis # NOQA - -from qgis.core import (QgsDateTimeRange, - QgsVectorLayerTemporalProperties, - QgsReadWriteContext, - QgsVectorLayer, - QgsVectorDataProviderTemporalCapabilities, - QgsUnitTypes, - QgsVectorLayerTemporalContext, - Qgis) -from qgis.PyQt.QtCore import (QDateTime, - QDate, - QTime, - QVariant) -from qgis.testing import start_app, unittest +from qgis.PyQt.QtCore import QDate, QDateTime, QTime, QVariant from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + Qgis, + QgsDateTimeRange, + QgsReadWriteContext, + QgsUnitTypes, + QgsVectorDataProviderTemporalCapabilities, + QgsVectorLayer, + QgsVectorLayerTemporalContext, + QgsVectorLayerTemporalProperties, +) +from qgis.testing import start_app, unittest app = start_app() diff --git a/tests/src/python/test_qgsvectorlayertools.py b/tests/src/python/test_qgsvectorlayertools.py index f9b4d97720c7..f3b322b5206b 100644 --- a/tests/src/python/test_qgsvectorlayertools.py +++ b/tests/src/python/test_qgsvectorlayertools.py @@ -10,11 +10,16 @@ __date__ = '2016-11-07' __copyright__ = 'Copyright 2015, The QGIS Project' -from qgis.core import QgsFeatureRequest, QgsVectorLayer, QgsProject, QgsVectorLayerTools -from qgis.testing import start_app, unittest - import os +from qgis.core import ( + QgsFeatureRequest, + QgsProject, + QgsVectorLayer, + QgsVectorLayerTools, +) +from qgis.testing import start_app, unittest + start_app() diff --git a/tests/src/python/test_qgsvectorlayerutils.py b/tests/src/python/test_qgsvectorlayerutils.py index 1e629f12631b..79996f74de9a 100644 --- a/tests/src/python/test_qgsvectorlayerutils.py +++ b/tests/src/python/test_qgsvectorlayerutils.py @@ -9,31 +9,28 @@ __date__ = '25/10/2016' __copyright__ = 'Copyright 2016, The QGIS Project' -import os -import qgis # NOQA import shutil import tempfile -from qgis.PyQt.QtCore import QVariant, QDate -from qgis.core import (QgsProject, - QgsVectorLayer, - QgsVectorLayerUtils, - QgsFieldConstraints, - QgsFeature, - QgsFeatureIterator, - QgsGeometry, - QgsPointXY, - QgsDefaultValue, - QgsRelation, - QgsFields, - QgsField, - QgsMemoryProviderUtils, - QgsWkbTypes, - QgsCoordinateReferenceSystem, - QgsVectorLayerJoinInfo, - NULL - ) +import qgis # NOQA +from qgis.PyQt.QtCore import QVariant +from qgis.core import ( + NULL, + QgsDefaultValue, + QgsFeature, + QgsField, + QgsFieldConstraints, + QgsFields, + QgsGeometry, + QgsPointXY, + QgsProject, + QgsRelation, + QgsVectorLayer, + QgsVectorLayerJoinInfo, + QgsVectorLayerUtils, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsvectorlayerutils_postgres.py b/tests/src/python/test_qgsvectorlayerutils_postgres.py index ed4ac06ceec6..dea35b5e1ca4 100644 --- a/tests/src/python/test_qgsvectorlayerutils_postgres.py +++ b/tests/src/python/test_qgsvectorlayerutils_postgres.py @@ -10,13 +10,14 @@ __copyright__ = 'Copyright 2021, The QGIS Project' import os -import qgis # NOQA -from qgis.core import (QgsVectorLayer, - QgsVectorLayerUtils, - QgsDefaultValue, - NULL - ) +import qgis # NOQA +from qgis.core import ( + NULL, + QgsDefaultValue, + QgsVectorLayer, + QgsVectorLayerUtils, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsvectortile.py b/tests/src/python/test_qgsvectortile.py index 06b6b8ed6e37..273e64ad509f 100644 --- a/tests/src/python/test_qgsvectortile.py +++ b/tests/src/python/test_qgsvectortile.py @@ -19,20 +19,20 @@ from pathlib import Path import qgis # NOQA -from qgis.PyQt.QtCore import QUrl from qgis.PyQt.QtTest import QSignalSpy -from qgis.core import (QgsVectorLayer, - QgsVectorTileWriter, - QgsDataSourceUri, - QgsTileXYZ, - QgsProviderRegistry, - QgsVectorTileLayer, - QgsProviderMetadata, - QgsGeometry, - QgsSelectionContext, - Qgis - ) -from qgis.testing import unittest, start_app +from qgis.core import ( + Qgis, + QgsDataSourceUri, + QgsGeometry, + QgsProviderRegistry, + QgsSelectionContext, + QgsTileXYZ, + QgsVectorLayer, + QgsVectorTileLayer, + QgsVectorTileWriter, +) +from qgis.testing import start_app, unittest + from utilities import unitTestDataPath TEST_DATA_PATH = Path(unitTestDataPath()) diff --git a/tests/src/python/test_qgsvectorwarper.py b/tests/src/python/test_qgsvectorwarper.py index bc2d1b8096a6..858b3446a0dd 100644 --- a/tests/src/python/test_qgsvectorwarper.py +++ b/tests/src/python/test_qgsvectorwarper.py @@ -10,19 +10,20 @@ __copyright__ = 'Copyright 2022, The QGIS Project' import qgis # NOQA + from qgis.analysis import ( - QgsVectorWarper, QgsGcpPoint, - QgsGcpTransformerInterface + QgsGcpTransformerInterface, + QgsVectorWarper, ) from qgis.core import ( - QgsVectorLayer, + QgsCoordinateReferenceSystem, QgsFeature, + QgsFeatureStore, QgsGeometry, QgsPointXY, - QgsFeatureStore, - QgsCoordinateReferenceSystem, - QgsProject + QgsProject, + QgsVectorLayer, ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsvirtuallayerdefinition.py b/tests/src/python/test_qgsvirtuallayerdefinition.py index 71a82c0debda..8f58d2876e2c 100644 --- a/tests/src/python/test_qgsvirtuallayerdefinition.py +++ b/tests/src/python/test_qgsvirtuallayerdefinition.py @@ -9,17 +9,17 @@ __date__ = '10/12/2015' __copyright__ = 'Copyright 2015, The QGIS Project' -import qgis # NOQA - -from qgis.core import (QgsField, - QgsWkbTypes, - QgsFields, - QgsVirtualLayerDefinition - ) +import os +import qgis # NOQA +from qgis.PyQt.QtCore import QUrl, QVariant +from qgis.core import ( + QgsField, + QgsFields, + QgsVirtualLayerDefinition, + QgsWkbTypes, +) from qgis.testing import unittest -from qgis.PyQt.QtCore import QVariant, QUrl -import os def strToUrl(s): diff --git a/tests/src/python/test_qgsvirtuallayertask.py b/tests/src/python/test_qgsvirtuallayertask.py index c9cff3319f85..ff731408b3dd 100644 --- a/tests/src/python/test_qgsvirtuallayertask.py +++ b/tests/src/python/test_qgsvirtuallayertask.py @@ -9,18 +9,19 @@ __date__ = '28/02/2018' __copyright__ = 'Copyright 2018, The QGIS Project' -import qgis # NOQA import os +import qgis # NOQA +from qgis.PyQt.QtCore import QCoreApplication from qgis.core import ( + QgsApplication, QgsProject, QgsVectorLayer, - QgsApplication, QgsVirtualLayerDefinition, - QgsVirtualLayerTask + QgsVirtualLayerTask, ) -from qgis.PyQt.QtCore import QCoreApplication from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_qgsvtpk.py b/tests/src/python/test_qgsvtpk.py index d6e74c317758..1330735c3199 100644 --- a/tests/src/python/test_qgsvtpk.py +++ b/tests/src/python/test_qgsvtpk.py @@ -11,9 +11,9 @@ import qgis # NOQA from qgis.core import ( - QgsVtpkTiles, + QgsCoordinateTransformContext, QgsVectorTileLayer, - QgsCoordinateTransformContext + QgsVtpkTiles, ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsxmlutils.py b/tests/src/python/test_qgsxmlutils.py index b746fca361dc..2dc971d5bcd8 100644 --- a/tests/src/python/test_qgsxmlutils.py +++ b/tests/src/python/test_qgsxmlutils.py @@ -10,25 +10,23 @@ __copyright__ = 'Copyright 2016, The QGIS Project' import qgis # NOQA switch sip api -from qgis.core import (QgsXmlUtils, - QgsProperty, - QgsGeometry, - QgsFeatureRequest, - QgsCoordinateReferenceSystem, - QgsProcessingOutputLayerDefinition, - QgsProcessingFeatureSourceDefinition, - QgsRemappingSinkDefinition, - QgsWkbTypes, - QgsCoordinateTransform, - QgsFields, - QgsField, - QgsProject, - NULL) - -from qgis.PyQt.QtCore import QDateTime, QDate, QTime, QVariant -from qgis.PyQt.QtXml import QDomDocument +from qgis.PyQt.QtCore import QDate, QDateTime, QTime, QVariant from qgis.PyQt.QtGui import QColor - +from qgis.PyQt.QtXml import QDomDocument +from qgis.core import ( + NULL, + QgsCoordinateReferenceSystem, + QgsFeatureRequest, + QgsField, + QgsFields, + QgsGeometry, + QgsProcessingFeatureSourceDefinition, + QgsProcessingOutputLayerDefinition, + QgsProperty, + QgsRemappingSinkDefinition, + QgsWkbTypes, + QgsXmlUtils, +) from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_qgsziputils.py b/tests/src/python/test_qgsziputils.py index 8788e01446c3..74728f679e17 100644 --- a/tests/src/python/test_qgsziputils.py +++ b/tests/src/python/test_qgsziputils.py @@ -10,10 +10,12 @@ __copyright__ = 'Copyright 2017, The QGIS Project' import os + +from qgis.PyQt.QtCore import QTemporaryDir, QTemporaryFile from qgis.core import QgsZipUtils from qgis.testing import unittest + from utilities import unitTestDataPath -from qgis.PyQt.QtCore import QTemporaryFile, QTemporaryDir def tmpPath(): diff --git a/tests/src/python/test_qgszonalstatistics.py b/tests/src/python/test_qgszonalstatistics.py index af7cb0d3a4b9..13a0a31841a2 100644 --- a/tests/src/python/test_qgszonalstatistics.py +++ b/tests/src/python/test_qgszonalstatistics.py @@ -9,14 +9,21 @@ __date__ = '15/07/2013' __copyright__ = 'Copyright 2013, The QGIS Project' -import qgis # NOQA import os import shutil + +import qgis # NOQA from qgis.PyQt.QtCore import QDir, QFile, QTemporaryDir -from qgis.core import QgsVectorLayer, QgsRasterLayer, QgsFeature, QgsFeatureRequest, QgsGeometry from qgis.analysis import QgsZonalStatistics - +from qgis.core import ( + QgsFeature, + QgsFeatureRequest, + QgsGeometry, + QgsRasterLayer, + QgsVectorLayer, +) from qgis.testing import start_app, unittest + from utilities import unitTestDataPath start_app() diff --git a/tests/src/python/test_selective_masking.py b/tests/src/python/test_selective_masking.py index 1aaf2f857ba3..95508f5163ad 100644 --- a/tests/src/python/test_selective_masking.py +++ b/tests/src/python/test_selective_masking.py @@ -12,60 +12,44 @@ __author__ = 'Hugo Mercier / Oslandia' __date__ = '28/06/2019' -import qgis # NOQA import os import subprocess -from qgis.PyQt.QtCore import ( - Qt, - QSize, - QRectF, - QDir -) - -from qgis.PyQt.QtGui import ( - QColor, - QImage, - QPainter -) - -from qgis.testing import unittest, start_app - -from utilities import ( - unitTestDataPath, - getTempfilePath, - getTestFont, -) - +import qgis # NOQA +from qgis.PyQt.QtCore import QDir, QRectF, QSize, Qt +from qgis.PyQt.QtGui import QColor, QImage, QPainter from qgis.core import ( Qgis, - QgsMapSettings, QgsCoordinateReferenceSystem, - QgsRectangle, - QgsProject, - QgsSymbolLayerReference, + QgsLayout, + QgsLayoutExporter, + QgsLayoutItemMap, + QgsLayoutItemPage, + QgsLayoutSize, + QgsMapRendererCache, + QgsMapRendererCustomPainterJob, QgsMapRendererParallelJob, QgsMapRendererSequentialJob, - QgsMapRendererCustomPainterJob, - QgsRenderChecker, + QgsMapSettings, QgsMarkerSymbol, QgsMaskMarkerSymbolLayer, - QgsSingleSymbolRenderer, - QgsSymbolLayerId, - QgsSymbolLayerUtils, - QgsMapRendererCache, - QgsUnitTypes, QgsOuterGlowEffect, QgsPalLayerSettings, + QgsProject, QgsProperty, + QgsRectangle, + QgsRenderChecker, QgsRenderContext, - QgsLayout, - QgsLayoutItemPage, - QgsLayoutSize, - QgsLayoutItemMap, - QgsLayoutExporter, + QgsSingleSymbolRenderer, + QgsSymbolLayerId, + QgsSymbolLayerReference, + QgsSymbolLayerUtils, + QgsUnitTypes, QgsWkbTypes, ) +from qgis.testing import start_app, unittest + +from utilities import getTempfilePath, getTestFont, unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_stylestorage_gpkg.py b/tests/src/python/test_stylestorage_gpkg.py index 711c3ffbb3d7..5d125ac6d86c 100644 --- a/tests/src/python/test_stylestorage_gpkg.py +++ b/tests/src/python/test_stylestorage_gpkg.py @@ -12,13 +12,13 @@ __copyright__ = 'Copyright 2022, ItOpen' import os -from stylestoragebase import StyleStorageTestBase + from qgis.PyQt.QtCore import QTemporaryDir -from qgis.core import ( - QgsProviderRegistry, -) +from qgis.core import QgsProviderRegistry from qgis.testing import unittest +from stylestoragebase import StyleStorageTestBase + class StyleStorageTest(unittest.TestCase, StyleStorageTestBase): diff --git a/tests/src/python/test_stylestorage_mssql.py b/tests/src/python/test_stylestorage_mssql.py index 8c47d39bde31..c75c48aec23d 100644 --- a/tests/src/python/test_stylestorage_mssql.py +++ b/tests/src/python/test_stylestorage_mssql.py @@ -12,13 +12,12 @@ __copyright__ = 'Copyright 2022, ItOpen' import os -from stylestoragebase import StyleStorageTestBase, StyleStorageTestCaseBase -from qgis.PyQt.QtCore import QTemporaryDir -from qgis.core import ( - QgsDataSourceUri -) + +from qgis.core import QgsDataSourceUri from qgis.testing import unittest +from stylestoragebase import StyleStorageTestBase, StyleStorageTestCaseBase + class StyleStorageTest(StyleStorageTestCaseBase, StyleStorageTestBase): diff --git a/tests/src/python/test_stylestorage_oracle.py b/tests/src/python/test_stylestorage_oracle.py index c77970915633..d0a4a656e2c6 100644 --- a/tests/src/python/test_stylestorage_oracle.py +++ b/tests/src/python/test_stylestorage_oracle.py @@ -12,14 +12,12 @@ __copyright__ = 'Copyright 2022, ItOpen' import os -from stylestoragebase import StyleStorageTestBase, StyleStorageTestCaseBase -from qgis.PyQt.QtCore import QTemporaryDir -from qgis.core import ( - QgsDataSourceUri, - QgsProviderRegistry, -) + +from qgis.core import QgsDataSourceUri, QgsProviderRegistry from qgis.testing import unittest +from stylestoragebase import StyleStorageTestBase, StyleStorageTestCaseBase + class StyleStorageTest(StyleStorageTestCaseBase, StyleStorageTestBase): diff --git a/tests/src/python/test_stylestorage_postgres.py b/tests/src/python/test_stylestorage_postgres.py index f17a27946b72..773c573c80c9 100644 --- a/tests/src/python/test_stylestorage_postgres.py +++ b/tests/src/python/test_stylestorage_postgres.py @@ -12,13 +12,12 @@ __copyright__ = 'Copyright 2022, ItOpen' import os -from stylestoragebase import StyleStorageTestBase, StyleStorageTestCaseBase -from qgis.PyQt.QtCore import QTemporaryDir -from qgis.core import ( - QgsDataSourceUri -) + +from qgis.core import QgsDataSourceUri from qgis.testing import unittest +from stylestoragebase import StyleStorageTestBase, StyleStorageTestCaseBase + class StyleStorageTest(StyleStorageTestCaseBase, StyleStorageTestBase): diff --git a/tests/src/python/test_stylestorage_spatialite.py b/tests/src/python/test_stylestorage_spatialite.py index 9fbbec0e5d22..08ba9bca5016 100644 --- a/tests/src/python/test_stylestorage_spatialite.py +++ b/tests/src/python/test_stylestorage_spatialite.py @@ -13,13 +13,12 @@ import os import shutil -from stylestoragebase import StyleStorageTestBase, StyleStorageTestCaseBase + from qgis.PyQt.QtCore import QTemporaryDir -from qgis.core import ( - QgsProviderRegistry, - QgsDataSourceUri, -) +from qgis.core import QgsDataSourceUri, QgsProviderRegistry from qgis.testing import unittest + +from stylestoragebase import StyleStorageTestBase, StyleStorageTestCaseBase from utilities import unitTestDataPath TEST_DATA_DIR = unitTestDataPath() diff --git a/tests/src/python/test_syntactic_sugar.py b/tests/src/python/test_syntactic_sugar.py index 64556121e1a1..9ac3862fa061 100644 --- a/tests/src/python/test_syntactic_sugar.py +++ b/tests/src/python/test_syntactic_sugar.py @@ -11,12 +11,8 @@ import qgis # NOQA -from qgis.testing import unittest, start_app -from qgis.core import (edit, - QgsFeature, - QgsVectorLayer, - QgsEditError - ) +from qgis.core import QgsEditError, QgsFeature, QgsVectorLayer, edit +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/test_testrunner.py b/tests/src/python/test_testrunner.py index 5c6148623faf..022d88b9eb2e 100644 --- a/tests/src/python/test_testrunner.py +++ b/tests/src/python/test_testrunner.py @@ -10,11 +10,9 @@ __copyright__ = 'Copyright 2018, The QGIS Project' import qgis # NOQA -import sys -from qgis.testing import unittest -from console import console from qgis.core import Qgis +from qgis.testing import unittest class TestTestRunner(unittest.TestCase): diff --git a/tests/src/python/test_versioncompare.py b/tests/src/python/test_versioncompare.py index f06b45fa33af..d9fd969d7b58 100644 --- a/tests/src/python/test_versioncompare.py +++ b/tests/src/python/test_versioncompare.py @@ -16,8 +16,8 @@ import qgis # NOQA -from qgis.testing import unittest, start_app from pyplugin_installer.version_compare import compareVersions +from qgis.testing import start_app, unittest start_app() diff --git a/tests/src/python/utilities.py b/tests/src/python/utilities.py index 800c0377d580..ecb889443d37 100644 --- a/tests/src/python/utilities.py +++ b/tests/src/python/utilities.py @@ -9,35 +9,33 @@ __date__ = '20/01/2011' __copyright__ = 'Copyright 2012, The QGIS Project' -import qgis # NOQA - import os -import sys import platform -import tempfile import re +import sys +import tempfile + +import qgis # NOQA try: - from urllib2 import urlopen, HTTPError, URLError + from urllib2 import HTTPError, URLError, urlopen except ImportError: from urllib.request import urlopen, HTTPError, URLError -from qgis.PyQt.QtCore import QDir, QUrl, QUrlQuery +import hashlib +import subprocess +import webbrowser from qgis.core import ( QgsCoordinateReferenceSystem, - QgsVectorFileWriter, - QgsMapSettings, + QgsFontUtils, QgsMapRendererParallelJob, QgsMapRendererSequentialJob, - QgsFontUtils + QgsMapSettings, + QgsVectorFileWriter, ) +from qgis.PyQt.QtCore import QDir, QUrl, QUrlQuery from qgis.testing import start_app -import hashlib - - -import webbrowser -import subprocess GEOCRS = 4326 # constant for EPSG:GEOCRS Geographic CRS id diff --git a/tests/testdata/complex_names.py b/tests/testdata/complex_names.py index 1ebeb9bdfbdd..f10b96536f95 100644 --- a/tests/testdata/complex_names.py +++ b/tests/testdata/complex_names.py @@ -9,14 +9,11 @@ *************************************************************************** """ -from qgis.PyQt.QtCore import QCoreApplication -from qgis.core import (QgsProcessing, - QgsFeatureSink, - QgsProcessingException, - QgsProcessingAlgorithm, - QgsProcessingParameterString, - QgsProcessingOutputString) -from qgis import processing +from qgis.core import ( + QgsProcessingAlgorithm, + QgsProcessingOutputString, + QgsProcessingParameterString, +) class AlgWithComplexParamNames(QgsProcessingAlgorithm): diff --git a/tests/testdata/convert_to_upper.py b/tests/testdata/convert_to_upper.py index e2d2258952fe..941a978918c9 100644 --- a/tests/testdata/convert_to_upper.py +++ b/tests/testdata/convert_to_upper.py @@ -9,13 +9,11 @@ *************************************************************************** """ -from qgis.PyQt.QtCore import QCoreApplication -from qgis.core import (QgsProcessing, - QgsFeatureSink, - QgsProcessingException, - QgsProcessingAlgorithm, - QgsProcessingParameterString, - QgsProcessingOutputString) +from qgis.core import ( + QgsProcessingAlgorithm, + QgsProcessingOutputString, + QgsProcessingParameterString, +) class ConvertStringToUppercase(QgsProcessingAlgorithm):