aboutsummaryrefslogtreecommitdiffstats
path: root/cryptography
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-02-03 15:42:04 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-02-03 15:42:04 -0800
commit450bb4c6609d246ded86959de3d925df81afdba9 (patch)
tree458d4cd404178dbf994fb107c35b1d29f8fa1146 /cryptography
parenta45a770f88ad4444c80e52966f5022c4fb287ce5 (diff)
downloadcryptography-450bb4c6609d246ded86959de3d925df81afdba9.tar.gz
cryptography-450bb4c6609d246ded86959de3d925df81afdba9.tar.bz2
cryptography-450bb4c6609d246ded86959de3d925df81afdba9.zip
Rename and document
Diffstat (limited to 'cryptography')
-rw-r--r--cryptography/hazmat/backends/__init__.py4
-rw-r--r--cryptography/hazmat/backends/multibackend.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/cryptography/hazmat/backends/__init__.py b/cryptography/hazmat/backends/__init__.py
index 0818033f..41d260a8 100644
--- a/cryptography/hazmat/backends/__init__.py
+++ b/cryptography/hazmat/backends/__init__.py
@@ -12,7 +12,7 @@
# limitations under the License.
from cryptography.hazmat.backends import openssl
-from cryptography.hazmat.backends.multibackend import PrioritizedMultiBackend
+from cryptography.hazmat.backends.multibackend import MultiBackend
from cryptography.hazmat.bindings.commoncrypto.binding import (
Binding as CommonCryptoBinding
)
@@ -24,7 +24,7 @@ if CommonCryptoBinding.is_available():
_ALL_BACKENDS.append(commoncrypto.backend)
-_default_backend = PrioritizedMultiBackend(_ALL_BACKENDS)
+_default_backend = MultiBackend(_ALL_BACKENDS)
def default_backend():
diff --git a/cryptography/hazmat/backends/multibackend.py b/cryptography/hazmat/backends/multibackend.py
index 94152370..49a4014d 100644
--- a/cryptography/hazmat/backends/multibackend.py
+++ b/cryptography/hazmat/backends/multibackend.py
@@ -24,7 +24,7 @@ from cryptography.hazmat.backends.interfaces import (
@utils.register_interface(HashBackend)
@utils.register_interface(HMACBackend)
@utils.register_interface(PBKDF2HMACBackend)
-class PrioritizedMultiBackend(object):
+class MultiBackend(object):
name = "multibackend"
def __init__(self, backends):