Merge pull request #106 from jschlyter/update_deps

Update black

Author: jschlyter

Diff for: poetry.lock

@@ -45,7 +45,7 @@ readerwriterlock = "^1.0.9"
 
 [tool.poetry.dev-dependencies]
 alabaster = "^0.7.12"
-black = "^21.5b1"
+black = "^22"
 isort = "^5.6.4"
 pytest = "^6.1.2"
 pytest-black = "^0.3.12"

Diff for: pyproject.toml

@@ -27,7 +27,7 @@
 
 logger = logging.getLogger(__name__)
 
-JWT_TYPES = (u"JWT", u"application/jws", u"JWS", u"JWE")
+JWT_TYPES = ("JWT", "application/jws", "JWS", "JWE")
 
 JWT_CLAIMS = {
     "iss": str,

Diff for: src/cryptojwt/__init__.py

@@ -158,10 +158,10 @@ def test_serialize_rsa_priv_key():
 
 ECKEY = {
     "crv": "P-521",
-    "x": u"AekpBQ8ST8a8VcfVOTNl353vSrDCLLJXmPk06wTjxrrjcBpXp5EOnYG_NjFZ6OvLFV1jSfS9tsz4qUxcWceqwQGk",
-    "y": u"ADSmRA43Z1DSNx_RvcLI87cdL07l6jQyyBXMoxVg_l2Th"
-    u"-x3S1WDhjDly79ajL4Kkd0AZMaZmh9ubmf63e3kyMj2",
-    "d": u"AY5pb7A0UFiB3RELSD64fTLOSV_jazdF7fLYyuTw8lOfRhWg6Y6rUrPAxerEzgdRhajnu0ferB0d53vM9mE15j2C",
+    "x": "AekpBQ8ST8a8VcfVOTNl353vSrDCLLJXmPk06wTjxrrjcBpXp5EOnYG_NjFZ6OvLFV1jSfS9tsz4qUxcWceqwQGk",
+    "y": "ADSmRA43Z1DSNx_RvcLI87cdL07l6jQyyBXMoxVg_l2Th"
+    "-x3S1WDhjDly79ajL4Kkd0AZMaZmh9ubmf63e3kyMj2",
+    "d": "AY5pb7A0UFiB3RELSD64fTLOSV_jazdF7fLYyuTw8lOfRhWg6Y6rUrPAxerEzgdRhajnu0ferB0d53vM9mE15j2C",
 }
 
 

Diff for: tests/test_02_jwk.py

@@ -600,23 +600,23 @@ def test_dump_jwk():
 JWKS_DICT = {
     "keys": [
         {
-            "n": u"zkpUgEgXICI54blf6iWiD2RbMDCOO1jV0VSff1MFFnujM4othfMsad7H1kRo50YM5S_X9TdvrpdOfpz5aBaKFhT6Ziv0nhtcekq1eRl8mjBlvGKCE5XGk-0LFSDwvqgkJoFYInq7bu0a4JEzKs5AyJY75YlGh879k1Uu2Sv3ZZOunfV1O1Orta-NvS-aG_jN5cstVbCGWE20H0vFVrJKNx0Zf-u-aA-syM4uX7wdWgQ-owoEMHge0GmGgzso2lwOYf_4znanLwEuO3p5aabEaFoKNR4K6GjQcjBcYmDEE4CtfRU9AEmhcD1kleiTB9TjPWkgDmT9MXsGxBHf3AKT5w",
-            "e": u"AQAB",
+            "n": "zkpUgEgXICI54blf6iWiD2RbMDCOO1jV0VSff1MFFnujM4othfMsad7H1kRo50YM5S_X9TdvrpdOfpz5aBaKFhT6Ziv0nhtcekq1eRl8mjBlvGKCE5XGk-0LFSDwvqgkJoFYInq7bu0a4JEzKs5AyJY75YlGh879k1Uu2Sv3ZZOunfV1O1Orta-NvS-aG_jN5cstVbCGWE20H0vFVrJKNx0Zf-u-aA-syM4uX7wdWgQ-owoEMHge0GmGgzso2lwOYf_4znanLwEuO3p5aabEaFoKNR4K6GjQcjBcYmDEE4CtfRU9AEmhcD1kleiTB9TjPWkgDmT9MXsGxBHf3AKT5w",
+            "e": "AQAB",
             "kty": "RSA",
             "kid": "5-VBFv40P8D4I-7SFz7hMugTbPs",
             "use": "enc",
         },
         {
-            "k": u"YTEyZjBlMDgxMGI4YWU4Y2JjZDFiYTFlZTBjYzljNDU3YWM0ZWNiNzhmNmFlYTNkNTY0NzMzYjE",
+            "k": "YTEyZjBlMDgxMGI4YWU4Y2JjZDFiYTFlZTBjYzljNDU3YWM0ZWNiNzhmNmFlYTNkNTY0NzMzYjE",
             "kty": "oct",
             "use": "enc",
         },
         {
             "kty": "EC",
             "kid": "7snis",
             "use": "sig",
-            "x": u"q0WbWhflRbxyQZKFuQvh2nZvg98ak-twRoO5uo2L7Po",
-            "y": u"GOd2jL_6wa0cfnyA0SmEhok9fkYEnAHFKLLM79BZ8_E",
+            "x": "q0WbWhflRbxyQZKFuQvh2nZvg98ak-twRoO5uo2L7Po",
+            "y": "GOd2jL_6wa0cfnyA0SmEhok9fkYEnAHFKLLM79BZ8_E",
             "crv": "P-256",
         },
     ]

Diff for: tests/test_03_key_bundle.py

@@ -641,7 +641,7 @@ def test_signer_protected_headers():
     _key = ECKey().load_key(eck)
     keys = [_key]
     _jws = JWS(payload, alg="ES256")
-    protected = dict(header1=u"header1 is protected", header2="header2 is protected too", a=1)
+    protected = dict(header1="header1 is protected", header2="header2 is protected too", a=1)
     _jwt = _jws.sign_compact(keys, protected=protected)
 
     exp_protected = protected.copy()
@@ -665,14 +665,14 @@ def test_verify_protected_headers():
     _key = ECKey().load_key(eck)
     keys = [_key]
     _jws = JWS(payload, alg="ES256")
-    protected = dict(header1=u"header1 is protected", header2="header2 is protected too", a=1)
+    protected = dict(header1="header1 is protected", header2="header2 is protected too", a=1)
     _jwt = _jws.sign_compact(keys, protected=protected)
     protectedHeader, enc_payload, sig = _jwt.split(".")
     data = dict(
         payload=enc_payload,
         signatures=[
             dict(
-                header=dict(alg=u"ES256", jwk=_key.serialize()),
+                header=dict(alg="ES256", jwk=_key.serialize()),
                 protected=protectedHeader,
                 signature=sig,
             )