Merge branch 'master' of github.com:openid/JWTConnect-Python-CryptoJWT

Author: rohe

src/cryptojwt/__init__.py

@@ -8,6 +8,13 @@
 from .utils import b64d
 from .utils import split_token
 
+from cryptojwt.jwk import JWK
+from cryptojwt.jws.jws import JWS
+from cryptojwt.jwe.jwe import JWE
+from cryptojwt.jwt import JWT
+from cryptojwt.key_jar import KeyJar
+from cryptojwt.key_bundle import KeyBundle
+
 try:
     from builtins import zip
     from builtins import hex

src/cryptojwt/jws/jws.py

@@ -197,11 +197,11 @@ def verify_compact_verbose(self, jws=None, keys=None, allow_none=False,
             if isinstance(self['alg'], list):
                 if _alg not in self["alg"] :
                     raise SignerAlgError(
-                        "Wrong signing algorithm, expected {} go {}".format(
+                        "Wrong signing algorithm, expected {} got {}".format(
                             self['alg'], _alg))
             elif _alg != self['alg']:
                 raise SignerAlgError(
-                    "Wrong signing algorithm, expected {} go {}".format(
+                    "Wrong signing algorithm, expected {} got {}".format(
                         self['alg'], _alg))
 
         if sigalg and sigalg != _alg:
@@ -374,7 +374,7 @@ def _is_json_serialized_jws(self, json_jws):
 
     def _is_compact_jws(self, jws):
         """
-        Check if we've go a compact signed JWT
+        Check if we've got a compact signed JWT
 
         :param jws: The message
         :return: True/False