From 308854a2fc918a11db45e2cc69d7c6ebdb4b65a6 Mon Sep 17 00:00:00 2001 From: zebra-lucky Date: Fri, 28 Nov 2025 22:13:06 +0200 Subject: [PATCH] replace deprecated utcnow with utc --- src/jmclient/auth.py | 3 ++- test/jmclient/test_auth.py | 12 +++++++++--- test/jmclient/test_wallet_rpc.py | 3 ++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/jmclient/auth.py b/src/jmclient/auth.py index 56d5627..1a841c8 100644 --- a/src/jmclient/auth.py +++ b/src/jmclient/auth.py @@ -76,7 +76,8 @@ class JMTokenAuthority: def _issue(self, token_type: str) -> str: return jwt.encode( { - "exp": datetime.datetime.utcnow() + self.SESSION_VALIDITY[token_type], + "exp": datetime.datetime.now(datetime.UTC) + + self.SESSION_VALIDITY[token_type], "scope": self.scope, }, self.signature_key[token_type], diff --git a/test/jmclient/test_auth.py b/test/jmclient/test_auth.py index 68aea86..2aec00f 100644 --- a/test/jmclient/test_auth.py +++ b/test/jmclient/test_auth.py @@ -29,7 +29,9 @@ class TestJMTokenAuthority: ) def test_verify_valid(self, sig, token_type): token = jwt.encode( - {"exp": datetime.datetime.utcnow() + self.validity, "scope": self.scope}, + {"exp": datetime.datetime.now(datetime.UTC) + + self.validity, + "scope": self.scope}, sig, algorithm=self.token_auth.SIGNATURE_ALGORITHM, ) @@ -42,7 +44,9 @@ class TestJMTokenAuthority: def test_verify_expired(self): token = jwt.encode( - {"exp": datetime.datetime.utcnow() - self.validity, "scope": self.scope}, + {"exp": datetime.datetime.now(datetime.UTC) - + self.validity, + "scope": self.scope}, self.access_sig, algorithm=self.token_auth.SIGNATURE_ALGORITHM, ) @@ -52,7 +56,9 @@ class TestJMTokenAuthority: def test_verify_non_scoped(self): token = jwt.encode( - {"exp": datetime.datetime.utcnow() + self.validity, "scope": "wrong"}, + {"exp": datetime.datetime.now(datetime.UTC) + + self.validity, + "scope": "wrong"}, self.access_sig, algorithm=self.token_auth.SIGNATURE_ALGORITHM, ) diff --git a/test/jmclient/test_wallet_rpc.py b/test/jmclient/test_wallet_rpc.py index 7479ef1..7677878 100644 --- a/test/jmclient/test_wallet_rpc.py +++ b/test/jmclient/test_wallet_rpc.py @@ -762,7 +762,8 @@ class TrialTestWRPC_JWT(WalletRPCTestBase): handler(response) def get_token(self, grant_type: str, status: str = "valid"): - now, delta = datetime.datetime.utcnow(), datetime.timedelta(hours=1) + now = datetime.datetime.now(datetime.UTC) + delta = datetime.timedelta(hours=1) exp = now - delta if status == "expired" else now + delta scope = f"walletrpc {self.daemon.wallet_name}"