lint

Author: jschlyter

src/cryptojwt/key_bundle.py

@@ -8,8 +8,7 @@
 import time
 from datetime import datetime
 from functools import cmp_to_key
-from typing import List
-from typing import Optional
+from typing import List, Optional
 
 import requests
 
@@ -18,23 +17,19 @@
 from cryptojwt.jwk.okp import OKP_CRV2PUBLIC
 from cryptojwt.jwk.x509 import import_private_key_from_pem_file
 
-from .exception import JWKException
-from .exception import UnknownKeyType
-from .exception import UnsupportedAlgorithm
-from .exception import UnsupportedECurve
-from .exception import UpdateFailed
-from .jwk.ec import ECKey
-from .jwk.ec import new_ec_key
+from .exception import (
+    JWKException,
+    UnknownKeyType,
+    UnsupportedAlgorithm,
+    UnsupportedECurve,
+    UpdateFailed,
+)
+from .jwk.ec import ECKey, new_ec_key
 from .jwk.hmac import SYMKey
-from .jwk.jwk import dump_jwk
-from .jwk.jwk import import_jwk
-from .jwk.okp import OKPKey
-from .jwk.okp import new_okp_key
-from .jwk.rsa import RSAKey
-from .jwk.rsa import new_rsa_key
-from .utils import as_unicode
-from .utils import check_content_type
-from .utils import httpc_params_loader
+from .jwk.jwk import dump_jwk, import_jwk
+from .jwk.okp import OKPKey, new_okp_key
+from .jwk.rsa import RSAKey, new_rsa_key
+from .utils import as_unicode, check_content_type, httpc_params_loader
 
 __author__ = "Roland Hedberg"
 
@@ -935,15 +930,13 @@ def dump_jwks(kbl, target, private=False, symmetric_too=False):
     res = {"keys": keys}
 
     try:
-        _fp = open(target, "w")
+        with open(target, "w") as fp:
+            json.dump(res, fp)
     except OSError:
         head, _ = os.path.split(target)
         os.makedirs(head)
-        _fp = open(target, "w")
-
-    _txt = json.dumps(res)
-    _fp.write(_txt)
-    _fp.close()
+        with open(target, "w") as fp:
+            json.dump(res, fp)
 
 
 def _set_kid(spec, bundle, kid_template, kid):

src/cryptojwt/key_issuer.py

@@ -1,20 +1,14 @@
 import json
 import logging
 import os
-from typing import List
-from typing import Optional
+from typing import List, Optional
 
 from requests import request
 
 from .jwe.utils import alg2keytype as jwe_alg2keytype
 from .jws.utils import alg2keytype as jws_alg2keytype
-from .key_bundle import KeyBundle
-from .key_bundle import build_key_bundle
-from .key_bundle import key_diff
-from .key_bundle import update_key_bundle
-from .utils import httpc_params_loader
-from .utils import importer
-from .utils import qualified_name
+from .key_bundle import KeyBundle, build_key_bundle, key_diff, update_key_bundle
+from .utils import httpc_params_loader, importer, qualified_name
 
 __author__ = "Roland Hedberg"
 
@@ -586,7 +580,8 @@ def init_key_issuer(public_path="", private_path="", key_defs="", read_only=True
 
     if private_path:
         if os.path.isfile(private_path):
-            _jwks = open(private_path).read()
+            with open(private_path) as fp:
+                _jwks = fp.read()
             _issuer = KeyIssuer()
             _issuer.import_jwks(json.loads(_jwks))
             if key_defs:
@@ -599,31 +594,29 @@ def init_key_issuer(public_path="", private_path="", key_defs="", read_only=True
                     else:
                         _issuer.set([_kb])
                         jwks = _issuer.export_jwks(private=True)
-                        fp = open(private_path, "w")
-                        fp.write(json.dumps(jwks))
-                        fp.close()
+                        with open(private_path, "w") as fp:
+                            json.dump(jwks, fp)
         else:
             _issuer = build_keyissuer(key_defs)
             if not read_only:
                 jwks = _issuer.export_jwks(private=True)
                 head, tail = os.path.split(private_path)
                 if head and not os.path.isdir(head):
                     os.makedirs(head)
-                fp = open(private_path, "w")
-                fp.write(json.dumps(jwks))
-                fp.close()
+                with open(private_path, "w") as fp:
+                    json.dump(jwks, fp)
 
         if public_path and not read_only:
             jwks = _issuer.export_jwks()  # public part
             head, tail = os.path.split(public_path)
             if head and not os.path.isdir(head):
                 os.makedirs(head)
-            fp = open(public_path, "w")
-            fp.write(json.dumps(jwks))
-            fp.close()
+            with open(public_path, "w") as fp:
+                json.dump(jwks, fp)
     elif public_path:
         if os.path.isfile(public_path):
-            _jwks = open(public_path).read()
+            with open(public_path) as fp:
+                _jwks = fp.read()
             _issuer = KeyIssuer()
             _issuer.import_jwks(json.loads(_jwks))
             if key_defs:
@@ -636,19 +629,17 @@ def init_key_issuer(public_path="", private_path="", key_defs="", read_only=True
                         update_key_bundle(_kb, _diff)
                         _issuer.set([_kb])
                         jwks = _issuer.export_jwks()
-                        fp = open(public_path, "w")
-                        fp.write(json.dumps(jwks))
-                        fp.close()
+                        with open(public_path, "w") as fp:
+                            json.dump(jwks, fp)
         else:
             _issuer = build_keyissuer(key_defs)
             if not read_only:
                 _jwks = _issuer.export_jwks()
                 head, tail = os.path.split(public_path)
                 if head and not os.path.isdir(head):
                     os.makedirs(head)
-                fp = open(public_path, "w")
-                fp.write(json.dumps(_jwks))
-                fp.close()
+                with open(public_path, "w") as fp:
+                    json.dump(_jwks, fp)
     else:
         _issuer = build_keyissuer(key_defs)
 

src/cryptojwt/tools/jwtpeek.py

@@ -13,8 +13,7 @@
 from cryptojwt.jwe import jwe
 from cryptojwt.jwk.hmac import SYMKey
 from cryptojwt.jwk.jwk import key_from_jwk_dict
-from cryptojwt.jwk.rsa import RSAKey
-from cryptojwt.jwk.rsa import import_rsa_key
+from cryptojwt.jwk.rsa import RSAKey, import_rsa_key
 from cryptojwt.jws import jws
 from cryptojwt.key_bundle import KeyBundle
 from cryptojwt.key_issuer import KeyIssuer
@@ -112,12 +111,14 @@ def main():
         keys.append(SYMKey(key=args.hmac_key, kid=_kid))
 
     if args.jwk:
-        _key = key_from_jwk_dict(open(args.jwk).read())
+        with open(args.jwk) as fp:
+            _key = key_from_jwk_dict(fp.read())
         keys.append(_key)
 
     if args.jwks:
         _iss = KeyIssuer()
-        _iss.import_jwks(open(args.jwks).read())
+        with open(args.jwks) as fp:
+            _iss.import_jwks(fp.read())
         keys.extend(_iss.all_keys())
 
     if args.jwks_url:
@@ -128,7 +129,8 @@ def main():
         message = sys.stdin.read()
     else:
         if os.path.isfile(args.msg):
-            message = open(args.msg).read().strip("\n")
+            with open(args.msg) as fp:
+                message = fp.read().strip("\n")
         else:
             message = args.msg