Rename backends

lepture · lepture · commit 7b548a73328b · 2020-06-20T20:48:29.000+09:00
diff --git a/authlib/jose/rfc7518/__init__.py b/authlib/jose/rfc7518/__init__.py
@@ -1,7 +1,7 @@
 from .jws_algorithms import register_jws_rfc7518
 from .jwe_algorithms import register_jwe_rfc7518
 from .oct_key import OctKey
-from ._backends import (
+from ._cryptography_backends import (
     RSAKey, ECKey, ECDHAlgorithm,
     import_key, load_pem_key, export_key,
 )
diff --git a/authlib/jose/rfc7518/_backends/__init__.py b/authlib/jose/rfc7518/_backends/__init__.py
diff --git a/authlib/jose/rfc7518/_cryptography_backends/__init__.py b/authlib/jose/rfc7518/_cryptography_backends/__init__.py
@@ -0,0 +1,7 @@
+from ._jws import JWS_ALGORITHMS
+from ._jwe_alg import JWE_ALG_ALGORITHMS, ECDHAlgorithm
+from ._jwe_enc import JWE_ENC_ALGORITHMS
+from ._keys import (
+    RSAKey, ECKey,
+    load_pem_key, import_key, export_key,
+)
diff --git a/authlib/jose/rfc7518/_cryptography_backends/_jwe_alg.py b/authlib/jose/rfc7518/_cryptography_backends/_jwe_alg.py
@@ -17,7 +17,7 @@
     urlsafe_b64encode
 )
 from authlib.jose.rfc7516 import JWEAlgorithm
-from ._keys_cryptography import RSAKey, ECKey
+from ._keys import RSAKey, ECKey
 from ..oct_key import OctKey
 
 
diff --git a/authlib/jose/rfc7518/_cryptography_backends/_jwe_enc.py b/authlib/jose/rfc7518/_cryptography_backends/_jwe_enc.py
diff --git a/authlib/jose/rfc7518/_cryptography_backends/_jws.py b/authlib/jose/rfc7518/_cryptography_backends/_jws.py
@@ -16,7 +16,7 @@
 from cryptography.hazmat.primitives.asymmetric import padding
 from cryptography.exceptions import InvalidSignature
 from authlib.jose.rfc7515 import JWSAlgorithm
-from ._keys_cryptography import RSAKey, ECKey
+from ._keys import RSAKey, ECKey
 from ..util import encode_int, decode_int
 
 
diff --git a/authlib/jose/rfc7518/_cryptography_backends/_keys.py b/authlib/jose/rfc7518/_cryptography_backends/_keys.py
diff --git a/authlib/jose/rfc7518/jwe_algorithms.py b/authlib/jose/rfc7518/jwe_algorithms.py
@@ -1,6 +1,6 @@
 import zlib
-from ._backends import JWE_ALG_ALGORITHMS, JWE_ENC_ALGORITHMS
 from .oct_key import OctKey
+from ._cryptography_backends import JWE_ALG_ALGORITHMS, JWE_ENC_ALGORITHMS
 from ..rfc7516 import JWEAlgorithm, JWEZipAlgorithm, JsonWebEncryption
 
 
diff --git a/authlib/jose/rfc7518/jws_algorithms.py b/authlib/jose/rfc7518/jws_algorithms.py
@@ -10,8 +10,8 @@
 
 import hmac
 import hashlib
-from ._backends import JWS_ALGORITHMS
 from .oct_key import OctKey
+from ._cryptography_backends import JWS_ALGORITHMS
 from ..rfc7515 import JWSAlgorithm, JsonWebSignature
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`from .jws_algorithms import register_jws_rfc7518`
`2`	`2`	`from .jwe_algorithms import register_jwe_rfc7518`
`3`	`3`	`from .oct_key import OctKey`
`4`		`-from ._backends import (`
	`4`	`+from ._cryptography_backends import (`
`5`	`5`	`RSAKey, ECKey, ECDHAlgorithm,`
`6`	`6`	`import_key, load_pem_key, export_key,`
`7`	`7`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`urlsafe_b64encode`
`18`	`18`	`)`
`19`	`19`	`from authlib.jose.rfc7516 import JWEAlgorithm`
`20`		`-from ._keys_cryptography import RSAKey, ECKey`
	`20`	`+from ._keys import RSAKey, ECKey`
`21`	`21`	`from ..oct_key import OctKey`
`22`	`22`
`23`	`23`