aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-09-30 21:54:51 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-09-30 21:54:51 -0500
commit35bb1ae1355981228c8599f0d57d474ac34db499 (patch)
tree039da1536ffb21546530b08d703406c7dfde32f0
parent5ea5fa7cbe811d51b69368475f82cf5dc8296e9f (diff)
parent1b271977e1de6f7a4cc8a6149c0d4a8e85375e4d (diff)
downloadcryptography-35bb1ae1355981228c8599f0d57d474ac34db499.tar.gz
cryptography-35bb1ae1355981228c8599f0d57d474ac34db499.tar.bz2
cryptography-35bb1ae1355981228c8599f0d57d474ac34db499.zip
Merge pull request #1375 from alex/bump-deprecation
Bump pending -> deprecated to for things deprecated in 0.6
-rw-r--r--cryptography/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cryptography/utils.py b/cryptography/utils.py
index f4c2e3cb..c489ebe2 100644
--- a/cryptography/utils.py
+++ b/cryptography/utils.py
@@ -17,7 +17,7 @@ import sys
DeprecatedIn05 = DeprecationWarning
-DeprecatedIn06 = PendingDeprecationWarning
+DeprecatedIn06 = DeprecationWarning
def register_interface(iface):