refactor option merging, add myself to AUTHORS, s/dict()/{}

Author: Michael Davis

AUTHORS

@@ -21,3 +21,5 @@ Patches and Suggestions
  - Mark Adams <mark@markadams.me>
 
  - Wouter Bolsterlee <uws@xs4all.nl>
+
+ - Michael Davis <mike.philip.davis@gmail.com> <mike.davis@workiva.com>

jwt/api.py

@@ -36,13 +36,7 @@ def __init__(self, algorithms=None, options=None):
             'verify_aud': True,
         }
 
-        try:
-            merged_options = dict()
-            for k, v in self.default_options.items():
-                merged_options[k] = options.get(k, v)
-            self.options = merged_options
-        except AttributeError as e:
-            raise TypeError('options must be a dictionary: %s' % e)
+        self.options = self._merge_options(self.default_options, options)
 
     def register_algorithm(self, alg_id, alg_obj):
         """
@@ -254,15 +248,17 @@ def _validate_claims(self, payload, audience=None, issuer=None, leeway=0,
             if payload.get('iss') != issuer:
                 raise InvalidIssuerError('Invalid issuer')
 
-    def _merge_options(self, override_options=None):
+    def _merge_options(self, default_options=None, override_options=None):
+        if not default_options:
+            default_options = {}
+
         if not override_options:
             override_options = {}
 
         try:
-            merged_options = dict()
-            for k, v in self.options.items():
-                merged_options[k] = override_options.get(k, v)
-        except AttributeError as e:
+            merged_options = self.default_options.copy()
+            merged_options.update(override_options)
+        except (AttributeError, ValueError) as e:
             raise TypeError('options must be a dictionary: %s' % e)
 
         return merged_options

tests/test_api.py

@@ -81,12 +81,12 @@ def test_override_options(self):
         expected_options['verify_nbf'] = False
         self.assertEqual(expected_options, self.jwt.options)
 
-    def test_non_existant_options_dont_exist(self):
+    def test_non_default_options_persist(self):
         self.jwt = PyJWT(options={'verify_iat': False, 'foobar': False})
         expected_options = self.jwt.default_options
         expected_options['verify_iat'] = False
+        expected_options['foobar'] = False
         self.assertEqual(expected_options, self.jwt.options)
-        self.assertNotIn('foobar', self.jwt.options)
 
     def test_options_must_be_dict(self):
         self.assertRaises(TypeError, PyJWT, options=object())