Issue #237 python3.6 compatibilty fix

Open-EO · May 3, 2023 · 00e5cdb · 00e5cdb
1 parent 438cc69
commit 00e5cdb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/openeo/rest/auth/oidc.py b/openeo/rest/auth/oidc.py
@@ -858,7 +858,7 @@ def get_tokens(self, request_refresh_token: bool = False) -> AccessTokenResult:
                             error = resp.json()["error"]
                         except Exception:
                             error = "unknown"
-                        log.info(f"[{elapsed():5.1f}s] not authorized yet: {error=}")
+                        log.info(f"[{elapsed():5.1f}s] not authorized yet: {error}")
                         if error == "authorization_pending":
                             poll_ui.show_progress(status="Authorization pending")
                         elif error == "slow_down":

diff --git a/tests/rest/auth/test_oidc.py b/tests/rest/auth/test_oidc.py
@@ -411,9 +411,7 @@ def test_oidc_device_flow_with_client_secret(requests_mock, caplog, support_veri
         (1011, "", "\n"),
     ]
 
-    assert re.search(
-        r"error='authorization_pending'.*error='slow_down'.*Authorized successfully", caplog.text, flags=re.DOTALL
-    )
+    assert re.search(r"authorization_pending.*slow_down.*Authorized successfully", caplog.text, flags=re.DOTALL)
 
 
 @pytest.mark.parametrize("support_verification_uri_complete", [False, True])
@@ -482,7 +480,7 @@ def test_oidc_device_flow_with_pkce(requests_mock, caplog, support_verification_
     ]
 
     assert re.search(
-        r"error='authorization_pending'.*error='authorization_pending'.*Authorized successfully",
+        r"authorization_pending.*authorization_pending.*Authorized successfully",
         caplog.text,
         flags=re.DOTALL,
     )
@@ -558,9 +556,7 @@ def test_oidc_device_flow_without_pkce_nor_secret(
         (1043.5, "", "\n"),
     ]
 
-    assert re.search(
-        r"error='authorization_pending'.*error='slow_down'.*Authorized successfully", caplog.text, flags=re.DOTALL
-    )
+    assert re.search(r"authorization_pending.*slow_down.*Authorized successfully", caplog.text, flags=re.DOTALL)
 
 
 @pytest.mark.parametrize(["mode", "client_id", "use_pkce", "client_secret", "expected_fields"], [
@@ -682,9 +678,7 @@ def test_oidc_device_flow_auto_detect(
         (1033, "", "\n"),
     ]
 
-    assert re.search(
-        r"error='authorization_pending'.*error='slow_down'.*Authorized successfully", caplog.text, flags=re.DOTALL
-    )
+    assert re.search(r"authorization_pending.*slow_down.*Authorized successfully", caplog.text, flags=re.DOTALL)
 
 
 def test_oidc_refresh_token_flow(requests_mock, caplog):