lint

Author: jschlyter

tests/test_02_jwk.py

@@ -68,10 +68,10 @@ def _eq(l1, l2):
 
 
 def test_urlsafe_base64decode():
-    l = base64_to_long(N)
+    length = base64_to_long(N)
     # convert it to base64
-    bys = long2intarr(l)
-    data = struct.pack("%sB" % len(bys), *bys)
+    bys = long2intarr(length)
+    data = struct.pack(f"{len(bys)}B", *bys)
     if not len(data):
         data = "\x00"
     s0 = base64.b64encode(data)
@@ -81,8 +81,8 @@ def test_urlsafe_base64decode():
         base64url_to_long(s0)
 
     # Not else, should not raise exception
-    l = base64_to_long(s0)
-    assert l
+    length = base64_to_long(s0)
+    assert length
 
 
 def test_import_rsa_key_from_cert_file():
@@ -246,7 +246,8 @@ def test_get_key():
 def test_private_rsa_key_from_jwk():
     keys = []
 
-    kspec = json.loads(open(full_path("jwk_private_key.json")).read())
+    with open(full_path("jwk_private_key.json")) as fp:
+        kspec = json.loads(fp.read())
     keys.append(key_from_jwk_dict(kspec))
 
     key = keys[0]
@@ -272,7 +273,8 @@ def test_private_rsa_key_from_jwk():
 def test_public_key_from_jwk():
     keys = []
 
-    kspec = json.loads(open(full_path("jwk_private_key.json")).read())
+    with open(full_path("jwk_private_key.json")) as fp:
+        kspec = json.loads(fp.read())
     keys.append(key_from_jwk_dict(kspec, private=False))
 
     key = keys[0]
@@ -288,7 +290,8 @@ def test_public_key_from_jwk():
 def test_ec_private_key_from_jwk():
     keys = []
 
-    kspec = json.loads(open(full_path("jwk_private_ec_key.json")).read())
+    with open(full_path("jwk_private_ec_key.json")) as fp:
+        kspec = json.loads(fp.read())
     keys.append(key_from_jwk_dict(kspec))
 
     key = keys[0]
@@ -306,7 +309,8 @@ def test_ec_private_key_from_jwk():
 def test_ec_public_key_from_jwk():
     keys = []
 
-    kspec = json.loads(open(full_path("jwk_private_ec_key.json")).read())
+    with open(full_path("jwk_private_ec_key.json")) as fp:
+        kspec = json.loads(fp.read())
     keys.append(key_from_jwk_dict(kspec, private=False))
 
     key = keys[0]

tests/test_03_key_bundle.py

@@ -1,4 +1,5 @@
 # pylint: disable=missing-docstring,no-self-use
+import contextlib
 import json
 import os
 import shutil
@@ -408,7 +409,7 @@ def test_mark_as_inactive():
     desc = {"kty": "oct", "key": "highestsupersecret", "use": "sig"}
     kb = KeyBundle([desc])
     assert len(kb.keys()) == 1
-    for k in kb.keys():
+    for k in kb.keys():  # noqa
         kb.mark_as_inactive(k.kid)
     desc = {"kty": "oct", "key": "highestsupersecret", "use": "enc"}
     kb.add_jwk_dicts([desc])
@@ -420,7 +421,7 @@ def test_copy():
     desc = {"kty": "oct", "key": "highestsupersecret", "use": "sig"}
     kb = KeyBundle([desc])
     assert len(kb.keys()) == 1
-    for k in kb.keys():
+    for k in kb.keys():  # noqa
         kb.mark_as_inactive(k.kid)
     desc = {"kty": "oct", "key": "highestsupersecret", "use": "enc"}
     kb.add_jwk_dicts([desc])
@@ -482,7 +483,7 @@ def test_httpc_params_1():
         httpc_params = {"timeout": (2, 2)}  # connect, read timeouts in seconds
         kb = KeyBundle(source=source, httpc=requests.request, httpc_params=httpc_params)
         updated, _ = kb._do_remote()
-        assert updated == True
+        assert updated is True
 
 
 @pytest.mark.network
@@ -908,7 +909,7 @@ def test_export_inactive():
     desc = {"kty": "oct", "key": "highestsupersecret", "use": "sig"}
     kb = KeyBundle([desc])
     assert len(kb.keys()) == 1
-    for k in kb.keys():
+    for k in kb.keys():  # noqa
         kb.mark_as_inactive(k.kid)
     desc = {"kty": "oct", "key": "highestsupersecret", "use": "enc"}
     kb.add_jwk_dicts([desc])
@@ -976,7 +977,7 @@ def test_remote_not_modified():
     with responses.RequestsMock() as rsps:
         rsps.add(method="GET", url=source, json=JWKS_DICT, status=200, headers=headers)
         updated, _ = kb._do_remote()
-        assert updated == True
+        assert updated is True
         assert kb.last_remote == headers.get("Last-Modified")
         timeout1 = kb.time_out
 
@@ -1019,28 +1020,26 @@ def test_ignore_errors_period():
             ignore_errors_period=ignore_errors_period,
         )
         res, _ = kb._do_remote()
-        assert res == True
+        assert res is True
         assert kb.ignore_errors_until is None
 
         # refetch, but fail by using a bad source
         kb.source = source_bad
-        try:
+        with contextlib.suppress(UpdateFailed):
             res, _ = kb._do_remote()
-        except UpdateFailed:
-            pass
 
         # retry should fail silently as we're in holddown
         res, _ = kb._do_remote()
         assert kb.ignore_errors_until is not None
-        assert res == False
+        assert res is False
 
         # wait until holddown
         time.sleep(ignore_errors_period + 1)
 
         # try again
         kb.source = source_good
         res, _ = kb._do_remote()
-        assert res == True
+        assert res is True
 
 
 def test_ignore_invalid_keys():

tests/test_04_key_issuer.py

@@ -287,7 +287,7 @@ def test_get_enc_not_mine(self):
         assert issuer.get("enc", "oct")
 
     def test_dump_issuer_keys(self):
-        kb = keybundle_from_local_file("file://%s/jwk.json" % BASE_PATH, "jwks", ["sig"])
+        kb = keybundle_from_local_file(f"file://{BASE_PATH}/jwk.json", "jwks", ["sig"])
         assert len(kb) == 1
         issuer = KeyIssuer()
         issuer.add_kb(kb)
@@ -701,7 +701,7 @@ def test_localhost_url():
     kb = issuer.find(url)
     assert len(kb) == 1
     assert "verify" in kb[0].httpc_params
-    assert kb[0].httpc_params["verify"] == False
+    assert kb[0].httpc_params["verify"] is False
 
 
 def test_add_url():

tests/test_04_key_jar.py

@@ -370,7 +370,7 @@ def test_get_enc_not_mine(self):
         assert ks.get("enc", "oct", "http://www.example.org/")
 
     def test_dump_issuer_keys(self):
-        kb = keybundle_from_local_file("file://%s/jwk.json" % BASE_PATH, "jwks", ["sig"])
+        kb = keybundle_from_local_file(f"file://{BASE_PATH}/jwk.json", "jwks", ["sig"])
         assert len(kb) == 1
         kj = KeyJar()
         kj.add_kb("", kb)
@@ -405,14 +405,11 @@ def test_no_use(self):
     def test_provider(self):
         kj = KeyJar()
         _url = "https://connect-op.herokuapp.com/jwks.json"
-        kj.load_keys(
-            "https://connect-op.heroku.com",
-            jwks_uri=_url,
-        )
+        kj.load_keys("https://connect-op.heroku.com", jwks_uri=_url)
         iss_keys = kj.get_issuer_keys("https://connect-op.heroku.com")
         if not iss_keys:
             _msg = f"{_url} is not available at this moment!"
-            warnings.warn(_msg)
+            warnings.warn(_msg, stacklevel=1)
         else:
             assert iss_keys[0].keys()
 

tests/test_05_jwx.py

@@ -50,7 +50,8 @@ def test_jws_set_jku():
 
 
 def test_jwx_set_x5c():
-    jwx = JWx(x5c=open(full_path("cert.pem")).read())
+    with open(full_path("cert.pem")) as fp:
+        jwx = JWx(x5c=fp.read())
     keys = jwx._get_keys()
     assert len(keys)
     assert isinstance(keys[0], RSAKey)

tests/test_06_jws.py

@@ -572,7 +572,7 @@ def test_signer_ps256_fail():
     except BadSignature:
         pass
     else:
-        assert False
+        raise AssertionError
 
 
 def test_signer_ps384():
@@ -645,11 +645,11 @@ def test_signer_eddsa_fail():
     _pubkey = OKPKey().load_key(okp2.public_key())
     _rj = JWS(alg="Ed25519")
     try:
-        info = _rj.verify_compact(_jwt, [_pubkey])
+        _ = _rj.verify_compact(_jwt, [_pubkey])
     except BadSignature:
         pass
     else:
-        assert False
+        raise AssertionError
 
 
 def test_no_alg_and_alg_none_same():
@@ -904,7 +904,7 @@ def test_rs256_rm_signature():
     except WrongNumberOfParts:
         pass
     else:
-        assert False
+        raise AssertionError
 
 
 def test_pick_alg_assume_alg_from_single_key():

tests/test_07_jwe.py

@@ -62,10 +62,7 @@ def str2intarr(string):
     return array.array("B", string).tolist()
 
 
-if sys.version < "3":
-    to_intarr = str2intarr
-else:
-    to_intarr = bytes2intarr
+to_intarr = str2intarr if sys.version < "3" else bytes2intarr
 
 
 def test_jwe_09_a1():
@@ -671,9 +668,9 @@ def test_fernet_symkey():
 
 def test_fernet_bad():
     with pytest.raises(TypeError):
-        encrypter = FernetEncrypter(key="xyzzy")
+        _ = FernetEncrypter(key="xyzzy")
     with pytest.raises(ValueError):
-        encrypter = FernetEncrypter(key=os.urandom(16))
+        _ = FernetEncrypter(key=os.urandom(16))
 
 
 def test_fernet_bytes():

tests/test_09_jwt.py

@@ -156,7 +156,7 @@ def test_jwt_pack_and_unpack_unknown_key():
     kj.add_kb(ALICE, KeyBundle())
     bob = JWT(key_jar=kj, iss=BOB, allowed_sign_algs=["RS256"])
     with pytest.raises(NoSuitableSigningKeys):
-        info = bob.unpack(_jwt)
+        _ = bob.unpack(_jwt)
 
 
 def test_jwt_pack_and_unpack_with_lifetime():

tests/test_31_utils.py

@@ -2,16 +2,16 @@
 
 
 def test_check_content_type():
-    assert check_content_type(content_type="application/json", mime_type="application/json") == True
+    assert check_content_type(content_type="application/json", mime_type="application/json") is True
     assert (
         check_content_type(
             content_type="application/json; charset=utf-8", mime_type="application/json"
         )
-        == True
+        is True
     )
     assert (
         check_content_type(
             content_type="application/html; charset=utf-8", mime_type="application/json"
         )
-        == False
+        is False
     )

tests/test_40_serialize.py

@@ -15,7 +15,7 @@ def full_path(local_file):
 
 
 def test_key_issuer():
-    kb = keybundle_from_local_file("file://%s/jwk.json" % BASE_PATH, "jwks", ["sig"])
+    kb = keybundle_from_local_file(f"file://{BASE_PATH}/jwk.json", "jwks", ["sig"])
     assert len(kb) == 1
     issuer = KeyIssuer()
     issuer.add(kb)