From 1e392ab1d9efaa57fe61c6c0fe943edd4a2ed9bd Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Thu, 29 Oct 2015 13:49:48 +0900
Subject: do the deprecation dance for the twelfth release

---
 src/cryptography/exceptions.py | 11 -----------
 src/cryptography/utils.py      |  3 +--
 2 files changed, 1 insertion(+), 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):
-- 
cgit v1.2.3


From aad57896ac6e2a70c5474108019b3da8ace6bc06 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Thu, 29 Oct 2015 13:52:28 +0900
Subject: oh right pep8 is a thing

---
 src/cryptography/exceptions.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/cryptography/exceptions.py b/src/cryptography/exceptions.py
index 4917e535..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
-- 
cgit v1.2.3