aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-03-07 12:34:33 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-03-09 00:16:33 -0500
commitebee006d2fd57194db61566a29d08739d19738b5 (patch)
treedb98085cb4f9cad44467fbd939b78149615fd187 /src
parent3dd326767b34980f3095c67251d77a86bc9202fe (diff)
downloadcryptography-ebee006d2fd57194db61566a29d08739d19738b5.tar.gz
cryptography-ebee006d2fd57194db61566a29d08739d19738b5.tar.bz2
cryptography-ebee006d2fd57194db61566a29d08739d19738b5.zip
Do the deprecation dance
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/hazmat/primitives/interfaces/__init__.py7
-rw-r--r--src/cryptography/utils.py3
2 files changed, 1 insertions, 9 deletions
diff --git a/src/cryptography/hazmat/primitives/interfaces/__init__.py b/src/cryptography/hazmat/primitives/interfaces/__init__.py
index 6913ace9..1e7b1215 100644
--- a/src/cryptography/hazmat/primitives/interfaces/__init__.py
+++ b/src/cryptography/hazmat/primitives/interfaces/__init__.py
@@ -386,10 +386,3 @@ class MACContext(object):
Checks if the generated message authentication code matches the
signature.
"""
-
-CMACContext = utils.deprecated(
- MACContext,
- __name__,
- "The CMACContext interface has been renamed to MACContext",
- utils.DeprecatedIn07
-)
diff --git a/src/cryptography/utils.py b/src/cryptography/utils.py
index 253dea55..0f8cbb27 100644
--- a/src/cryptography/utils.py
+++ b/src/cryptography/utils.py
@@ -10,8 +10,7 @@ import sys
import warnings
-DeprecatedIn07 = DeprecationWarning
-DeprecatedIn08 = PendingDeprecationWarning
+DeprecatedIn08 = DeprecationWarning
def read_only_property(name):