qgis · Jan 31, 2023
diff --git a/‎.flake8
Lines changed: 4 additions & 0 deletions b/‎.flake8
Lines changed: 4 additions & 0 deletions
diff --git a/‎tests/src/python/test_authmanager_oauth2_ows.py
Lines changed: 7 additions & 8 deletions b/‎tests/src/python/test_authmanager_oauth2_ows.py
Lines changed: 7 additions & 8 deletions
@@ -127,3 +127,7 @@ exclude =
 	python/server/auto_additions/,
 	# Plenty of star imports used
 	python/PyQt/
+	cmake/
+	# People using a virtualenv
+	.venv/
+	venv/
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Tests for auth manager WMS/WFS using QGIS Server through OAuth2
 enabled qgis_wrapped_server.py.
@@ -167,8 +166,8 @@ def setUpClass(cls):
         assert cls.port != 0
 
         # We need a valid port before we setup the oauth configuration
-        cls.token_uri = '%s://%s:%s/token' % (cls.protocol, cls.hostname, cls.port)
-        cls.refresh_token_uri = '%s://%s:%s/refresh' % (cls.protocol, cls.hostname, cls.port)
+        cls.token_uri = f'{cls.protocol}://{cls.hostname}:{cls.port}/token'
+        cls.refresh_token_uri = f'{cls.protocol}://{cls.hostname}:{cls.port}/refresh'
         # Need a random authcfg or the cache will bites us back!
         cls.authcfg_id = setup_oauth(cls.username, cls.password, cls.token_uri, cls.refresh_token_uri, str(random.randint(0, 10000000)))
         # This is to test wrong credentials
@@ -178,7 +177,7 @@ def setUpClass(cls):
         assert cls.auth_config.isValid()
 
         # Wait for the server process to start
-        assert waitServer('%s://%s:%s' % (cls.protocol, cls.hostname, cls.port)), "Server is not responding! %s://%s:%s" % (cls.protocol, cls.hostname, cls.port)
+        assert waitServer(f'{cls.protocol}://{cls.hostname}:{cls.port}'), f"Server is not responding! {cls.protocol}://{cls.hostname}:{cls.port}"
 
     @classmethod
     def tearDownClass(cls):
@@ -205,13 +204,13 @@ def _getWFSLayer(cls, type_name, layer_name=None, authcfg=None):
         parms = {
             'srsname': 'EPSG:4326',
             'typename': type_name,
-            'url': '%s://%s:%s/?map=%s' % (cls.protocol, cls.hostname, cls.port, cls.project_path),
+            'url': f'{cls.protocol}://{cls.hostname}:{cls.port}/?map={cls.project_path}',
             'version': 'auto',
             'table': '',
         }
         if authcfg is not None:
             parms.update({'authcfg': authcfg})
-        uri = ' '.join([("%s='%s'" % (k, v)) for k, v in list(parms.items())])
+        uri = ' '.join([(f"{k}='{v}'") for k, v in list(parms.items())])
         wfs_layer = QgsVectorLayer(uri, layer_name, 'WFS')
         return wfs_layer
 
@@ -224,7 +223,7 @@ def _getWMSLayer(cls, layers, layer_name=None, authcfg=None):
             layer_name = 'wms_' + layers.replace(',', '')
         parms = {
             'crs': 'EPSG:4326',
-            'url': '%s://%s:%s/?map=%s' % (cls.protocol, cls.hostname, cls.port, cls.project_path),
+            'url': f'{cls.protocol}://{cls.hostname}:{cls.port}/?map={cls.project_path}',
             'format': 'image/png',
             # This is needed because of a really weird implementation in QGIS Server, that
             # replaces _ in the the real layer name with spaces
@@ -235,7 +234,7 @@ def _getWMSLayer(cls, layers, layer_name=None, authcfg=None):
         }
         if authcfg is not None:
             parms.update({'authcfg': authcfg})
-        uri = '&'.join([("%s=%s" % (k, v.replace('=', '%3D'))) for k, v in list(parms.items())])
+        uri = '&'.join([("{}={}".format(k, v.replace('=', '%3D'))) for k, v in list(parms.items())])
         wms_layer = QgsRasterLayer(uri, layer_name, 'wms')
         return wms_layer