Changed PyJWT.default_options to options

and updated the CHANGELOG

Author: mark-adams

jwt/api.py

@@ -28,15 +28,15 @@ def __init__(self, algorithms=None, options=None):
         if not options:
             options = {}
 
-        self.default_options = {
+        default_options = {
             'verify_signature': True,
             'verify_exp': True,
             'verify_nbf': True,
             'verify_iat': True,
             'verify_aud': True,
         }
 
-        self.options = self._merge_options(self.default_options, options)
+        self.options = self._merge_options(default_options, options)
 
     def register_algorithm(self, alg_id, alg_obj):
         """
@@ -127,7 +127,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(override_options=options)
+            merged_options = self._merge_options(self.options, override_options=options)
             if merged_options.get('verify_signature'):
                 self._verify_signature(payload, signing_input, header, signature,
                                        key, algorithms)
@@ -256,7 +256,7 @@ def _merge_options(self, default_options=None, override_options=None):
             override_options = {}
 
         try:
-            merged_options = self.default_options.copy()
+            merged_options = default_options.copy()
             merged_options.update(override_options)
         except (AttributeError, ValueError) as e:
             raise TypeError('options must be a dictionary: %s' % e)

tests/test_api.py

@@ -71,19 +71,16 @@ def test_algorithms_parameter_removes_alg_from_algorithms_list(self):
         self.assertNotIn('none', self.jwt.get_algorithms())
         self.assertIn('HS256', self.jwt.get_algorithms())
 
-    def test_default_options(self):
-        self.assertEqual(self.jwt.default_options, self.jwt.options)
-
     def test_override_options(self):
         self.jwt = PyJWT(options={'verify_exp': False, 'verify_nbf': False})
-        expected_options = self.jwt.default_options
+        expected_options = self.jwt.options
         expected_options['verify_exp'] = False
         expected_options['verify_nbf'] = False
         self.assertEqual(expected_options, self.jwt.options)
 
-    def test_non_default_options_persist(self):
+    def test_non_object_options_persist(self):
         self.jwt = PyJWT(options={'verify_iat': False, 'foobar': False})
-        expected_options = self.jwt.default_options
+        expected_options = self.jwt.options
         expected_options['verify_iat'] = False
         expected_options['foobar'] = False
         self.assertEqual(expected_options, self.jwt.options)