Created merge_dict utility function

Author: mark-adams

jwt/api.py

@@ -12,7 +12,7 @@
     InvalidAlgorithmError, InvalidAudienceError, InvalidIssuedAtError,
     InvalidIssuerError
 )
-from .utils import base64url_decode, base64url_encode
+from .utils import base64url_decode, base64url_encode, merge_dict
 
 
 class PyJWT(object):
@@ -36,7 +36,7 @@ def __init__(self, algorithms=None, options=None):
             'verify_aud': True,
         }
 
-        self.options = self._merge_options(default_options, options)
+        self.options = merge_dict(default_options, options)
 
     def register_algorithm(self, alg_id, alg_obj):
         """
@@ -84,6 +84,7 @@ def encode(self, payload, key, algorithm='HS256', headers=None, json_encoder=Non
 
         # Header
         header = {'typ': 'JWT', 'alg': algorithm}
+        
         if headers:
             header.update(headers)
 
@@ -127,7 +128,7 @@ def decode(self, jwt, key='', verify=True, algorithms=None, options=None, **kwar
         payload, signing_input, header, signature = self._load(jwt)
 
         if verify:
-            merged_options = self._merge_options(self.options, options)
+            merged_options = merge_dict(self.options, options)
             if merged_options.get('verify_signature'):
                 self._verify_signature(payload, signing_input, header, signature,
                                        key, algorithms)
@@ -248,21 +249,6 @@ def _validate_claims(self, payload, audience=None, issuer=None, leeway=0,
             if payload.get('iss') != issuer:
                 raise InvalidIssuerError('Invalid issuer')
 
-    def _merge_options(self, original=None, updates=None):
-        if not original:
-            original = {}
-
-        if not updates:
-            return original
-
-        try:
-            merged_options = original.copy()
-            merged_options.update(updates)
-        except (AttributeError, ValueError) as e:
-            raise TypeError('options must be a dictionary: %s' % e)
-
-        return merged_options
-
 
 _jwt_global_obj = PyJWT()
 encode = _jwt_global_obj.encode

jwt/utils.py

@@ -12,3 +12,16 @@ def base64url_decode(input):
 
 def base64url_encode(input):
     return base64.urlsafe_b64encode(input).replace(b'=', b'')
+
+
+def merge_dict(original, updates):
+    if not updates:
+        return original
+
+    try:
+        merged_options = original.copy()
+        merged_options.update(updates)
+    except (AttributeError, ValueError) as e:
+        raise TypeError('original and updates must be a dictionary: %s' % e)
+
+    return merged_options