aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-03-09 14:06:54 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-03-09 14:06:54 -0400
commitd0109a59993ba568bb81a67a062dcfb460692447 (patch)
tree4efd634ba2b5a535b9054b9bebdfd515f88d9c06 /src
parentcd26d88c4226fa1ceaf5f708b0912d8df4acaacf (diff)
parent891efd9268d7c6e140e387a771ba5a07d8c8446d (diff)
downloadcryptography-d0109a59993ba568bb81a67a062dcfb460692447.tar.gz
cryptography-d0109a59993ba568bb81a67a062dcfb460692447.tar.bz2
cryptography-d0109a59993ba568bb81a67a062dcfb460692447.zip
Merge pull request #1738 from reaperhulk/deprecation-dance
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):