moved register to jwk

Author: Marko Mrdjenovic

jose/constants.py

@@ -35,13 +35,5 @@ class Algorithms(object):
 
     KEYS = {}
 
-    def register_key(self, algorithm, key_class):
-        from jose.jwk import Key
-        if not issubclass(key_class, Key):
-            raise TypeError("Key class not a subclass of jwk.Key")
-        self.KEYS[algorithm] = key_class
-        self.SUPPORTED.add(algorithm)
-        return True
-
 
 ALGORITHMS = Algorithms()

jose/jwk.py

@@ -59,6 +59,14 @@ def get_key(algorithm):
     return None
 
 
+def register_key(algorithm, key_class):
+    if not issubclass(key_class, Key):
+        raise TypeError("Key class not a subclass of jwk.Key")
+    ALGORITHMS.KEYS[algorithm] = key_class
+    ALGORITHMS.SUPPORTED.add(algorithm)
+    return True
+
+
 def construct(key_data, algorithm=None):
     """
     Construct a Key object for the given algorithm with the given

tests/algorithms/test_base.py

@@ -1,6 +1,4 @@
-
-from jose.jwk import Key, HMACKey, RSAKey, ECKey
-from jose.constants import ALGORITHMS
+from jose.jwk import Key
 
 import pytest
 
@@ -20,13 +18,3 @@ def test_verify_is_interface(self, alg):
         with pytest.raises(NotImplementedError):
             alg.verify('msg', 'sig')
 
-
-class TestAlgorithms:
-
-    def test_register_key(self):
-        assert ALGORITHMS.register_key("ALG", Key)
-        from jose.jwk import get_key
-        assert get_key("ALG") == Key
-    
-        with pytest.raises(TypeError):
-            assert ALGORITHMS.register_key("ALG", object)

tests/test_jwk.py

@@ -1,10 +1,8 @@
-
 from jose import jwk
 from jose.exceptions import JWKError
 
 import pytest
 
-
 hmac_key = {
     "kty": "oct",
     "kid": "018c0ae5-4d9b-471b-bfd6-eef314bc7037",
@@ -122,3 +120,10 @@ def test_get_key(self):
         assert jwk.get_key("ES256") == jwk.ECKey
 
         assert jwk.get_key("NONEXISTENT") == None
+
+    def test_register_key(self):
+        assert jwk.register_key("ALG", jwk.Key)
+        assert jwk.get_key("ALG") == jwk.Key
+
+        with pytest.raises(TypeError):
+            assert jwk.register_key("ALG", object)