Fix imports

jschlyter · jschlyter · commit d27016d60355 · 2026-03-16T10:35:37.000+01:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ All contributions to the Python JwtConnect packages are welcome!
 
 Note that as this library is planned to be used in high-profile production code,
 we insist on a very high standards for the code and design, but don't feel shy:
-discuss your plans over 
+discuss your plans over
 [GitHub Issues](https://github.com/openid/JWTConnect-Python-OidcMsg/issues) and the
 [mailing list](http://lists.openid.net/mailman/listinfo/openid-specs-ab), and
 send in those pull requests!
@@ -42,14 +42,14 @@ requests).
 Before you work on a big new feature, get in touch to make sure that your work
 is inline with the direction of the project and get input on your architecture.
 You can file an [Issue](https://github.com/openid/JWTConnect-Python-OidcMsg/issues)
-discussing your proposal, or email the 
-[list](http://lists.openid.net/mailman/listinfo/openid-specs-ab). 
+discussing your proposal, or email the
+[list](http://lists.openid.net/mailman/listinfo/openid-specs-ab).
 
 ## Coding Standards
 
 The JWTCOnnect-Python-OidcMsg library follows the
-[PEP8](https://www.python.org/dev/peps/pep-0008/) 
-coding style for Python implementations. Please review your own code 
+[PEP8](https://www.python.org/dev/peps/pep-0008/)
+coding style for Python implementations. Please review your own code
 for adherence to the standard.
 
 ## Pull Request Reviews
diff --git a/doc/Makefile b/doc/Makefile
@@ -17,4 +17,4 @@ help:
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/src/cryptojwt/key_jar.py b/src/cryptojwt/key_jar.py
@@ -2,7 +2,6 @@
 import json
 import logging
 from collections import defaultdict
-from typing import List, Optional
 
 from requests import request
 
diff --git a/src/cryptojwt/tools/jwtpeek.py b/src/cryptojwt/tools/jwtpeek.py
@@ -37,12 +37,12 @@
 
 ./jwtpeek.py -f idtoken -J keys.jwks
 
-or 
+or
 
 (3) JWT from stdin, no keys
 
 echo json.web.token | ./jwtpeek.py
- 
+
 """
 
 
diff --git a/tests/ec-public.pem b/tests/ec-public.pem
@@ -2,4 +2,3 @@
 MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEBNVkO23bySJFBEg/YXNxlL9fkBrf
 gHCr7s8X4z0aqsy7b5VOZ1CjjNq4CwjFT9IYruMLYERClGC8mx9VD8BLrw==
 -----END PUBLIC KEY-----
-
diff --git a/tests/ec.pem b/tests/ec.pem
@@ -2,4 +2,4 @@
 MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEAb97f3Sw5anaTuSuP/QrP27wtN4tkewd
 \nbFJelq3pCBB0xpe1SjU5waxfnyrlMKG1oj0gm3sIhDGfyFFM2n65KIPMPl+q9V
 VS\nWvb9mSCrRZ7FDRrTTYAC5PsrrtYoIATf
------END PUBLIC KEY-----
+-----END PUBLIC KEY-----
diff --git a/tests/jwk_private_ec_key.json b/tests/jwk_private_ec_key.json
@@ -5,4 +5,4 @@
   "x": "Ijdv9ZAD7QaEYnEqY5als5NFbNP_LsyZgJMTcQhNsYo",
   "y": "Hpc9vdz77lQG0NJf5FZAaeOJTR-bMjIw9kkCE1duxKE",
   "d": "omnOYCv3UxQRIogRcd2VIHhaj46FTZU8GfdYS4qX2_w"
-}
+}
diff --git a/tests/jwk_private_key.json b/tests/jwk_private_key.json
@@ -11,4 +11,4 @@
   "p": "6MEg5Di_IFiPGKvMFRjyx2t7YAOQ4KfdIkU_Khny1t1eCG5O07omPe_jLU8I5fPaD5F5HhWExLNureHD4K6LB18JPE3VE8chQROiRSNPZo1-faUvHu-Dy0pr7I-TS8pl_P3vop1KelIbGwXhzPIRKQMqCEKi3tLJt4R_MQ18Dx0",
   "q": "1cZVPpUbf4p5n4cMv_kERCPh3cieMs4aVojgh3feAiJiLwWWL9Pc43oJUekK44aWMnbs68Y4kqXtc52PMtBDzVp0Gjt0lCY3M7MYRVI4JhtknqvQynMKQ2nKs3VldvVfY2SxyUmnRyEolQUGRA7rRMUyPb4AXhSR7oroRrJD59s",
   "qi": "50PhyaqbLSczhipWiYy149sLsGlx9cX0tnGMswy1JLam7nBvH4-MWB2oGwD2hmG-YN66q-xXBS9CVDLZZrj1sonRTQPtWE-zuZqds6_NVlk2Ge4_IAA3TZ9tvIfM5FZVTOQsExu3_LX8FGCspWC1R-zDqT45Y9bpaCwxekluO7Q"
-}
+}
diff --git a/tests/rsa-public.pem b/tests/rsa-public.pem
@@ -4,4 +4,3 @@ rbVBGf2Pk7PwiKAep3nko0CWds4MUIRlioCiigE6KSj2eExStNAFDf3jcjOfYpEV
 kaUsyGmwclKXxAPNRMr6GAJeKlbJqTs5eYd5tpBjdeW2rjkD/W6R77zp+EtuU4jY
 /zR2YWeqB6GdTnduKwIDAQAB
 -----END PUBLIC KEY-----
-
diff --git a/tests/size2048.key b/tests/size2048.key
@@ -24,4 +24,4 @@ Z86amGtk20CrNNFpQSlam8qWhQAvesFpQA2uqMHlnbxuHhsEC35qbVbFwdtzW3hK
 MeaO1uECgYBJgvilqYno7Stxu0nbK5GoBYqMSnJiLuJ83+6aTcFw7IryZFdaff24
 iKfRJ0mvbJoklJuBGDjoRYE6AT20nGZTc+Wbx2cMR3HNGqlPKRbUjViwo8xkR7fx
 mBmyncZCL2HldD8gPo5SvLEKcIwYg8foXCM/tNLcmYgdf6amY+MyXQ==
------END RSA PRIVATE KEY-----
+-----END RSA PRIVATE KEY-----
diff --git a/tests/test_keys/ec-p256-private.pem b/tests/test_keys/ec-p256-private.pem
@@ -3,4 +3,3 @@ MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgrp4E4eaFhHonpP/U
 8QRaFDTvCGy8mQrSfQod+QxmViehRANCAAQE1WQ7bdvJIkUESD9hc3GUv1+QGt+A
 cKvuzxfjPRqqzLtvlU5nUKOM2rgLCMVP0hiu4wtgREKUYLybH1UPwEuv
 -----END PRIVATE KEY-----
-
diff --git a/tests/test_keys/ec-p256-public.pem b/tests/test_keys/ec-p256-public.pem
@@ -2,4 +2,3 @@
 MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEBNVkO23bySJFBEg/YXNxlL9fkBrf
 gHCr7s8X4z0aqsy7b5VOZ1CjjNq4CwjFT9IYruMLYERClGC8mx9VD8BLrw==
 -----END PUBLIC KEY-----
-
diff --git a/tests/test_keys/ec-p384-private.pem b/tests/test_keys/ec-p384-private.pem
@@ -4,4 +4,3 @@ iVTFrhF1hVzR57YiMld16H7HcMzv6HNF/nHkiaITetKxCaKhZANiAATpTb3pcZ+C
 E9WYGiBho6391NUd5wx15qhGTWT0/2hl2DEvfxHEN/rXJUbG+mzCpvDSvz5IfDDF
 ryLtXb3fgSYxGA8VLPC24wT0PImF5L7u3Z4vjSmO38qkrIwBMkUKyTU=
 -----END PRIVATE KEY-----
-
diff --git a/tests/test_keys/ec-p384-public.pem b/tests/test_keys/ec-p384-public.pem
@@ -3,4 +3,3 @@ MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE6U296XGfghPVmBogYaOt/dTVHecMdeao
 Rk1k9P9oZdgxL38RxDf61yVGxvpswqbw0r8+SHwwxa8i7V2934EmMRgPFSzwtuME
 9DyJheS+7t2eL40pjt/KpKyMATJFCsk1
 -----END PUBLIC KEY-----
-
diff --git a/tests/test_keys/jwk.json b/tests/test_keys/jwk.json
@@ -9,4 +9,4 @@
       "n": "pKybs0WaHU_y4cHxWbm8Wzj66HtcyFn7Fh3n-99qTXu5yNa30MRYIYfSDwe9JVc1JUoGw41yq2StdGBJ40HxichjE-Yopfu3B58QlgJvToUbWD4gmTDGgMGxQxtv1En2yedaynQ73sDpIK-12JJDY55pvf-PCiSQ9OjxZLiVGKlClDus44_uv2370b9IN2JiEOF-a7JBqaTEYLPpXaoKWDSnJNonr79tL0T7iuJmO1l705oO3Y0TQ-INLY6jnKG_RpsvyvGNnwP9pMvcP1phKsWZ10ofuuhJGRp8IxQL9RfzT87OvF0RBSO1U73h09YP-corWDsnKIi6TbzRpN5YDw"
     }
   ]
-}
+}
diff --git a/tests/test_keys/rsa-1024-private.pem b/tests/test_keys/rsa-1024-private.pem
@@ -14,4 +14,3 @@ Pixzn7QPPAqeA4txREeckslmhtc+VU7iqSFO1JDqLxmhmdfT5aReOeECQGKfe9gJ
 oiTy02VzeMQ/2FSdkHG7ZjZYl1+rwA1Y+2eKstg88xpk456ePp4PBJ5MQLEQKvyq
 wXuCdEjuK8ipOaQ=
 -----END PRIVATE KEY-----
-
diff --git a/tests/test_keys/rsa-1024-public.pem b/tests/test_keys/rsa-1024-public.pem
@@ -4,4 +4,3 @@ rbVBGf2Pk7PwiKAep3nko0CWds4MUIRlioCiigE6KSj2eExStNAFDf3jcjOfYpEV
 kaUsyGmwclKXxAPNRMr6GAJeKlbJqTs5eYd5tpBjdeW2rjkD/W6R77zp+EtuU4jY
 /zR2YWeqB6GdTnduKwIDAQAB
 -----END PUBLIC KEY-----
-
diff --git a/tests/test_keys/rsa-1280-private.pem b/tests/test_keys/rsa-1280-private.pem
@@ -17,4 +17,3 @@ xGfx23wjBBY1QGVuE64o5cQn4/mf/qkCUQDpjF2GH+EqEinqTGAHlcEpKomp8cXH
 ZxVZ7l9KB3sk17aN58GUnuPaIda4D9dbqQjAzqRx6OcQf80oxEE4XUP6nbXkHHZO
 0lakd66lHnHikQ==
 -----END PRIVATE KEY-----
-
diff --git a/tests/test_keys/rsa-1280-public.pem b/tests/test_keys/rsa-1280-public.pem
@@ -5,4 +5,3 @@ MTQ8VD8/kT5OF1uf8/g7PX87FfSSJwhICgD/jZ5w5jwY9UNngMPLKEE81w5KRr92
 895QU7ssSCySZ8LVFK5Wd5wKOSsyqLfZ1WahzaQm8lRiSbgf0dcqLz0H7y59AgMB
 AAE=
 -----END PUBLIC KEY-----
-
diff --git a/tests/test_keys/rsa-2048-private.pem b/tests/test_keys/rsa-2048-private.pem
@@ -26,4 +26,3 @@ d2oejX6A2HSlnsCf1QHOzxpp1j05ZC6JrSFqxZEmNNeqYcahjdBjYXQYd0MaGqIu
 42Bj0JRO2Z3K1Udlb0shIt3fCEuTCoOQLPwmHm0cqP97A21ISLfg7BPiI25nbE7V
 Ip9YGido3N9hQycoqkETeYI=
 -----END PRIVATE KEY-----
-
diff --git a/tests/test_keys/rsa-2048-public.pem b/tests/test_keys/rsa-2048-public.pem
@@ -7,4 +7,3 @@ JnUResdM2TfsneTHjh1XI6TZu8UYghHSr5QRNwSAr4NgNzYVU3XPgm9n4QoAeJFy
 xkcNtwpszeKR4hYeeYmdV6jt3kHZN/VC+W/XqqB9sJp9q20mBFKaddxr/FhaEy4J
 fQIDAQAB
 -----END PUBLIC KEY-----
-
diff --git a/tests/test_keys/rsa-3072-private.pem b/tests/test_keys/rsa-3072-private.pem
@@ -38,4 +38,3 @@ kgW+6uqke4yB603Gj3m1eqxS2bV3BcR7+ZaR5hcu46dTv/p2MZ+LnS3MMhc+43YK
 1H60+frQ79QUAiKJm73U6o9al7NZBaTJZrAwfJGygOucprd0RmreCg4LtbSL3nt0
 wWHrbeVLAmn0Dlw2zyBc47B9
 -----END PRIVATE KEY-----
-
diff --git a/tests/test_keys/rsa-3072-public.pem b/tests/test_keys/rsa-3072-public.pem
@@ -9,4 +9,3 @@ tD85yVC9SSWE/ku9IwCfQ4anvUaYF1CgDA2WuJx4I3q3iKtham1+9q5s5Xt9SO8H
 VZ4aR26j6eP2ndzILfj5+kw3QOkCPjIWISAtHBr83PnNlvqoxdElN3tfFLfxxSf8
 /xqGtbsicV/ZOhn7bni7vq84JpdKCD9HxeCvnLIwQyv5AgMBAAE=
 -----END PUBLIC KEY-----
-
diff --git a/tests/test_keys/rsa-4096-private.pem b/tests/test_keys/rsa-4096-private.pem
@@ -50,4 +50,3 @@ dfajuukiLycB4Bl3ercPyDLDmPicUEizSO1LW+N5nk7Y2m3tGwrrncoEks19L36A
 H0Kua1AIg8wrLsE1eoRHaKalCYEo2J5jB8ji5gEnlvqDg4yjZ2NpTRm2HciKsQUL
 lyJo0JRs+DrjD7/jYUSzLyIODs3bQgk=
 -----END PRIVATE KEY-----
-
diff --git a/tests/test_keys/rsa-4096-public.pem b/tests/test_keys/rsa-4096-public.pem
@@ -12,4 +12,3 @@ mc2wT5xzUrwslbmFPhGA27FGPOt2S1ufZzZPdXJPF0XZkI1IHtHPyWP4oGJBgLsK
 zBgWD9TzW4zXGlLVnlsdPDeu1P8CeFX1skb6rgiGW7JyciKMqIBd3d7NMuEOxPJe
 VXLU9LZV6zI7I+Eqc8gz15kCAwEAAQ==
 -----END PUBLIC KEY-----
-
