diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-10-29 01:51:37 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-10-29 01:51:37 -0400 |
| commit | 81d4a35b08ba37cf51977a722114b802b5141593 (patch) | |
| tree | df96f63e4245fc449ab70ef4e14e52f608eb3d06 /src | |
| parent | 46a07705f1b9b6a4228eb56620f394675d4612f3 (diff) | |
| parent | aad57896ac6e2a70c5474108019b3da8ace6bc06 (diff) | |
| download | cryptography-81d4a35b08ba37cf51977a722114b802b5141593.tar.gz cryptography-81d4a35b08ba37cf51977a722114b802b5141593.tar.bz2 cryptography-81d4a35b08ba37cf51977a722114b802b5141593.zip | |
Merge pull request #2457 from reaperhulk/deprecation-dance
do the deprecation dance for the twelfth release
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/exceptions.py | 14 | ||||
| -rw-r--r-- | src/cryptography/utils.py | 3 |
2 files changed, 1 insertions, 16 deletions
diff --git a/src/cryptography/exceptions.py b/src/cryptography/exceptions.py index 3bf8a75b..ee43fed7 100644 --- a/src/cryptography/exceptions.py +++ b/src/cryptography/exceptions.py @@ -6,9 +6,6 @@ from __future__ import absolute_import, division, print_function from enum import Enum -from cryptography import utils -from cryptography.hazmat.primitives import twofactor - class _Reasons(Enum): BACKEND_MISSING_INTERFACE = 0 @@ -57,14 +54,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): |