aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/exceptions.py14
-rw-r--r--src/cryptography/utils.py3
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):