diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-10-29 13:49:48 +0900 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-10-29 13:49:48 +0900 |
commit | 1e392ab1d9efaa57fe61c6c0fe943edd4a2ed9bd (patch) | |
tree | 72134cf02e6f8be23e625bf64abb655712b9e86b | |
parent | 46a07705f1b9b6a4228eb56620f394675d4612f3 (diff) | |
download | cryptography-1e392ab1d9efaa57fe61c6c0fe943edd4a2ed9bd.tar.gz cryptography-1e392ab1d9efaa57fe61c6c0fe943edd4a2ed9bd.tar.bz2 cryptography-1e392ab1d9efaa57fe61c6c0fe943edd4a2ed9bd.zip |
do the deprecation dance for the twelfth release
-rw-r--r-- | src/cryptography/exceptions.py | 11 | ||||
-rw-r--r-- | src/cryptography/utils.py | 3 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/cryptography/exceptions.py b/src/cryptography/exceptions.py index 3bf8a75b..4917e535 100644 --- a/src/cryptography/exceptions.py +++ b/src/cryptography/exceptions.py @@ -57,14 +57,3 @@ class InternalError(Exception): class InvalidKey(Exception): pass - - -InvalidToken = utils.deprecated( - twofactor.InvalidToken, - __name__, - ( - "The InvalidToken exception has moved to the " - "cryptography.hazmat.primitives.twofactor module" - ), - utils.DeprecatedIn09 -) diff --git a/src/cryptography/utils.py b/src/cryptography/utils.py index dbd961f7..4449e85a 100644 --- a/src/cryptography/utils.py +++ b/src/cryptography/utils.py @@ -12,8 +12,7 @@ import sys import warnings -DeprecatedIn09 = DeprecationWarning -DeprecatedIn10 = PendingDeprecationWarning +DeprecatedIn10 = DeprecationWarning def read_only_property(name): |