feat: httpc_params_loader (httpc default timeout refactor)

Author: peppelinux

src/cryptojwt/key_bundle.py

@@ -168,6 +168,13 @@ def wrapper(self, *args, **kwargs):
     return wrapper
 
 
+def httpc_params_loader(httpc_params):
+    httpc_params = httpc_params or {}
+    if "timeout" not in httpc_params:
+        httpc_params["timeout"] = DEFAULT_HTTPC_TIMEOUT
+    return httpc_params
+
+
 class KeyBundle:
     """The Key Bundle"""
 
@@ -254,9 +261,7 @@ def __init__(
         else:
             self.httpc = requests.request
 
-        self.httpc_params = httpc_params or {}
-        if "timeout" not in self.httpc_params:
-            self.httpc_params["timeout"] = DEFAULT_HTTPC_TIMEOUT
+        self.httpc_params = httpc_params_loader(httpc_params)
 
         if keys:
             self.source = None

src/cryptojwt/key_issuer.py

@@ -8,9 +8,9 @@
 
 from .jwe.utils import alg2keytype as jwe_alg2keytype
 from .jws.utils import alg2keytype as jws_alg2keytype
-from .key_bundle import DEFAULT_HTTPC_TIMEOUT
 from .key_bundle import KeyBundle
 from .key_bundle import build_key_bundle
+from .key_bundle import httpc_params_loader
 from .key_bundle import key_diff
 from .key_bundle import update_key_bundle
 from .utils import importer
@@ -58,9 +58,7 @@ def __init__(
 
         self.ca_certs = ca_certs
         self.httpc = httpc or request
-        self.httpc_params = httpc_params or {}
-        if "timeout" not in self.httpc_params:
-            self.httpc_params["timeout"] = DEFAULT_HTTPC_TIMEOUT
+        self.httpc_params = httpc_params_loader(httpc_params)
         self.keybundle_cls = keybundle_cls
         self.name = name
         self.remove_after = remove_after

src/cryptojwt/key_jar.py

@@ -8,8 +8,8 @@
 from .exception import IssuerNotFound
 from .jwe.jwe import alg2keytype as jwe_alg2keytype
 from .jws.utils import alg2keytype as jws_alg2keytype
-from .key_bundle import DEFAULT_HTTPC_TIMEOUT
 from .key_bundle import KeyBundle
+from .key_bundle import httpc_params_loader
 from .key_issuer import KeyIssuer
 from .key_issuer import build_keyissuer
 from .key_issuer import init_key_issuer
@@ -51,9 +51,7 @@ def __init__(
         self.keybundle_cls = keybundle_cls
         self.remove_after = remove_after
         self.httpc = httpc or request
-        self.httpc_params = httpc_params or {}
-        if "timeout" not in self.httpc_params:
-            self.httpc_params["timeout"] = DEFAULT_HTTPC_TIMEOUT
+        self.httpc_params = httpc_params_loader(httpc_params)
 
         # Now part of httpc_params
         # self.verify_ssl = verify_ssl