Skip to content

Commit 1c17437

Browse files
committed
feat: httpc_params_loader (httpc default timeout refactor)
1 parent e3a6c43 commit 1c17437

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

src/cryptojwt/key_bundle.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,13 @@ def wrapper(self, *args, **kwargs):
168168
return wrapper
169169

170170

171+
def httpc_params_loader(httpc_params):
172+
httpc_params = httpc_params or {}
173+
if "timeout" not in httpc_params:
174+
httpc_params["timeout"] = DEFAULT_HTTPC_TIMEOUT
175+
return httpc_params
176+
177+
171178
class KeyBundle:
172179
"""The Key Bundle"""
173180

@@ -254,9 +261,7 @@ def __init__(
254261
else:
255262
self.httpc = requests.request
256263

257-
self.httpc_params = httpc_params or {}
258-
if "timeout" not in self.httpc_params:
259-
self.httpc_params["timeout"] = DEFAULT_HTTPC_TIMEOUT
264+
self.httpc_params = httpc_params_loader(httpc_params)
260265

261266
if keys:
262267
self.source = None

src/cryptojwt/key_issuer.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from .key_bundle import DEFAULT_HTTPC_TIMEOUT
1212
from .key_bundle import KeyBundle
1313
from .key_bundle import build_key_bundle
14+
from .key_bundle import httpc_params_loader
1415
from .key_bundle import key_diff
1516
from .key_bundle import update_key_bundle
1617
from .utils import importer
@@ -58,9 +59,7 @@ def __init__(
5859

5960
self.ca_certs = ca_certs
6061
self.httpc = httpc or request
61-
self.httpc_params = httpc_params or {}
62-
if "timeout" not in self.httpc_params:
63-
self.httpc_params["timeout"] = DEFAULT_HTTPC_TIMEOUT
62+
self.httpc_params = httpc_params_loader(httpc_params)
6463
self.keybundle_cls = keybundle_cls
6564
self.name = name
6665
self.remove_after = remove_after

src/cryptojwt/key_jar.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from .jws.utils import alg2keytype as jws_alg2keytype
1111
from .key_bundle import DEFAULT_HTTPC_TIMEOUT
1212
from .key_bundle import KeyBundle
13+
from .key_bundle import httpc_params_loader
1314
from .key_issuer import KeyIssuer
1415
from .key_issuer import build_keyissuer
1516
from .key_issuer import init_key_issuer
@@ -51,9 +52,7 @@ def __init__(
5152
self.keybundle_cls = keybundle_cls
5253
self.remove_after = remove_after
5354
self.httpc = httpc or request
54-
self.httpc_params = httpc_params or {}
55-
if "timeout" not in self.httpc_params:
56-
self.httpc_params["timeout"] = DEFAULT_HTTPC_TIMEOUT
55+
self.httpc_params = httpc_params_loader(httpc_params)
5756

5857
# Now part of httpc_params
5958
# self.verify_ssl = verify_ssl

0 commit comments

Comments
 (0)