From 358cff983d8fdd903fcfb0368e388f477c5a046f Mon Sep 17 00:00:00 2001 From: Zach Carrington Date: Thu, 30 Apr 2026 15:26:01 -0500 Subject: [PATCH 1/3] catch TokenError --- src/clearpass/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/clearpass/client.py b/src/clearpass/client.py index b409e15..32dc624 100644 --- a/src/clearpass/client.py +++ b/src/clearpass/client.py @@ -94,7 +94,7 @@ def test_connectivity(self): try: self._get_access_token() return True - except Exception: + except TokenError: return False @property From 48e994ebe6bf8ce4a5d67e6d6052dfa2c0198265 Mon Sep 17 00:00:00 2001 From: Zach Carrington Date: Thu, 30 Apr 2026 15:30:06 -0500 Subject: [PATCH 2/3] Pass error message to exception --- src/clearpass/client.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/clearpass/client.py b/src/clearpass/client.py index 32dc624..98ff5a1 100644 --- a/src/clearpass/client.py +++ b/src/clearpass/client.py @@ -83,10 +83,11 @@ def _get_access_token(self): verify=False, ) if res.status_code != 200: - logger.warning("Request for authentication returned HTTP " - f"{res.status_code}: {res.reason}") + error_message = "Request for authentication returned HTTP " \ + f"{res.status_code}: {res.reason}" + logger.warning(error_message) if res.status_code < 200 or res.status_code > 299: - raise TokenError() + raise TokenError(error_message) retjson = res.json() return retjson["access_token"] From d24fc9d6e3a1de1695471c4d76a7cf94b0273eaf Mon Sep 17 00:00:00 2001 From: Zach Carrington Date: Thu, 30 Apr 2026 15:36:36 -0500 Subject: [PATCH 3/3] update TokenError --- src/clearpass/exceptions.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/clearpass/exceptions.py b/src/clearpass/exceptions.py index cd8e73e..9a5fb1d 100644 --- a/src/clearpass/exceptions.py +++ b/src/clearpass/exceptions.py @@ -3,6 +3,5 @@ class ClearPassAPI(Exception): class TokenError(ClearPassAPI): - def __init__(self) -> None: - mesg = "Could not retrieve access token." - super().__init__(mesg) + def __init__(self, msg="Could not retrieve access token.") -> None: + super().__init__(msg)