Use abstract base classes instead of hard coded types

Author: illia-v

flask_jwt_extended/config.py

@@ -1,6 +1,12 @@
 import datetime
 from warnings import warn
 
+# In Python 2.7 collections.abc is a part of the collections module.
+try:
+    from collections.abc import Sequence, Set
+except ImportError:  # pragma: no cover
+    from collections import Sequence, Set
+
 from flask import current_app
 
 # Older versions of pyjwt do not have the requires_cryptography set. Also,
@@ -44,9 +50,8 @@ def token_location(self):
         locations = current_app.config['JWT_TOKEN_LOCATION']
         if isinstance(locations, str):
             locations = (locations,)
-        elif not isinstance(locations, (tuple, list, frozenset, set)):
-            raise RuntimeError('JWT_TOKEN_LOCATION must be a tuple, a list, a frozenset '
-                               'or a set')
+        elif not isinstance(locations, (Sequence, Set)):
+            raise RuntimeError('JWT_TOKEN_LOCATION must be a sequence or a set')
         elif not locations:
             raise RuntimeError('JWT_TOKEN_LOCATION must contain at least one '
                                'of "headers", "cookies", "query_string", or "json"')
@@ -207,9 +212,8 @@ def blacklist_checks(self):
         check_type = current_app.config['JWT_BLACKLIST_TOKEN_CHECKS']
         if isinstance(check_type, str):
             check_type = (check_type,)
-        elif not isinstance(check_type, (tuple, list, frozenset, set)):
-            raise RuntimeError('JWT_BLACKLIST_TOKEN_CHECKS must be a tuple, a list, a '
-                               'frozenset or a set')
+        elif not isinstance(check_type, (Sequence, Set)):
+            raise RuntimeError('JWT_BLACKLIST_TOKEN_CHECKS must be a sequence or a set')
         for item in check_type:
             if item not in ('access', 'refresh'):
                 err = 'JWT_BLACKLIST_TOKEN_CHECKS must be "access" or "refresh"'

tests/test_config.py

@@ -254,6 +254,10 @@ def test_invalid_config_options(app):
         with pytest.raises(RuntimeError):
             config.token_location
 
+        app.config['JWT_TOKEN_LOCATION'] = range(99)
+        with pytest.raises(RuntimeError):
+            config.token_location
+
         app.config['JWT_TOKEN_LOCATION'] = ['headers', 'cookies', 'banana']
         with pytest.raises(RuntimeError):
             config.token_location
@@ -291,6 +295,10 @@ def test_invalid_config_options(app):
         with pytest.raises(RuntimeError):
             config.blacklist_checks
 
+        app.config['JWT_BLACKLIST_TOKEN_CHECKS'] = range(99)
+        with pytest.raises(RuntimeError):
+            config.blacklist_checks
+
         app.config['JWT_BLACKLIST_TOKEN_CHECKS'] = ['access', 'banana']
         with pytest.raises(RuntimeError):
             config.blacklist_checks