diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-18 13:27:05 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-18 13:27:05 -0800 |
| commit | 36bb5072ca6475a9bb9610b003945fd468d3a057 (patch) | |
| tree | 08512317ebee9a8155e3cd3854ca1fc7eedc7442 /tests | |
| parent | 984eeeb388e79db6354efd884e0f5d8b7b069560 (diff) | |
| parent | dcf62db81ad60b3591ae6d83dce43c311a347ac2 (diff) | |
| download | cryptography-36bb5072ca6475a9bb9610b003945fd468d3a057.tar.gz cryptography-36bb5072ca6475a9bb9610b003945fd468d3a057.tar.bz2 cryptography-36bb5072ca6475a9bb9610b003945fd468d3a057.zip | |
Merge pull request #270 from dreid/register-to-utils-register_interface
Move interfaces.register to utils.register_interface in preparation for more interface modules.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hazmat/bindings/test_openssl.py | 3 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_block.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py index e4f8dd8b..9f27aab7 100644 --- a/tests/hazmat/bindings/test_openssl.py +++ b/tests/hazmat/bindings/test_openssl.py @@ -13,6 +13,7 @@ import pytest +from cryptography import utils from cryptography.exceptions import UnsupportedAlgorithm from cryptography.hazmat.bindings.openssl.backend import backend, Backend from cryptography.hazmat.primitives import interfaces @@ -25,7 +26,7 @@ class DummyMode(object): pass -@interfaces.register(interfaces.CipherAlgorithm) +@utils.register_interface(interfaces.CipherAlgorithm) class DummyCipher(object): pass diff --git a/tests/hazmat/primitives/test_block.py b/tests/hazmat/primitives/test_block.py index 963136b9..9460c53d 100644 --- a/tests/hazmat/primitives/test_block.py +++ b/tests/hazmat/primitives/test_block.py @@ -17,6 +17,7 @@ import binascii import pytest +from cryptography import utils from cryptography.exceptions import UnsupportedAlgorithm, AlreadyFinalized from cryptography.hazmat.primitives import interfaces from cryptography.hazmat.primitives.ciphers import ( @@ -24,7 +25,7 @@ from cryptography.hazmat.primitives.ciphers import ( ) -@interfaces.register(interfaces.CipherAlgorithm) +@utils.register_interface(interfaces.CipherAlgorithm) class DummyCipher(object): pass |