commit 31b3acbf09a181fcca9a90b96a308f538c6bb7ff
author Paul Kehrer <paul.l.kehrer@gmail.com> Sat Mar 14 21:21:52 2015 -0500
committer Paul Kehrer <paul.l.kehrer@gmail.com> Sat Mar 14 21:21:52 2015 -0500
tree bc22fb207cde5a702f1ac07186ea19bcf6c4d163
parent 0354694e9cc25d309a5bcb8c6c032fd1f28d9e4b
parent 4c9fa34f30bfa25762e6387133d7846d01572a0b

Merge pull request #1757 from alex/deprecated

Don't trigger any deprecation warnings on import

src/cryptography/hazmat/backends/openssl/dsa.py

diff --git a/src/cryptography/hazmat/backends/openssl/dsa.py b/src/cryptography/hazmat/backends/openssl/dsa.py
index 43c077d..5d7ca38 100644
--- a/src/cryptography/hazmat/backends/openssl/dsa.py
+++ b/src/cryptography/hazmat/backends/openssl/dsa.py
@@ -173,7 +173,7 @@
         )
 
 
-@utils.register_interface(dsa.DSAPublicKeyWithNumbers)
+@utils.register_interface(dsa.DSAPublicKeyWithSerialization)
 class _DSAPublicKey(object):
     def __init__(self, backend, dsa_cdata):
         self._backend = backend

src/cryptography/hazmat/primitives/interfaces/__init__.py

diff --git a/src/cryptography/hazmat/primitives/interfaces/__init__.py b/src/cryptography/hazmat/primitives/interfaces/__init__.py
index 1e7b121..c980e5a 100644
--- a/src/cryptography/hazmat/primitives/interfaces/__init__.py
+++ b/src/cryptography/hazmat/primitives/interfaces/__init__.py
@@ -141,7 +141,7 @@
 
 
 EllipticCurvePrivateKeyWithNumbers = utils.deprecated(
-    ec.EllipticCurvePrivateKeyWithNumbers,
+    ec.EllipticCurvePrivateKeyWithSerialization,
     __name__,
     (
         "The EllipticCurvePrivateKeyWithNumbers interface has moved to the "
@@ -163,7 +163,7 @@
 
 
 EllipticCurvePublicKeyWithNumbers = utils.deprecated(
-    ec.EllipticCurvePublicKeyWithNumbers,
+    ec.EllipticCurvePublicKeyWithSerialization,
     __name__,
     (
         "The EllipticCurvePublicKeyWithNumbers interface has moved to the "
@@ -215,7 +215,7 @@
 )
 
 DSAPrivateKeyWithNumbers = utils.deprecated(
-    dsa.DSAPrivateKeyWithNumbers,
+    dsa.DSAPrivateKeyWithSerialization,
     __name__,
     (
         "The DSAPrivateKeyWithNumbers interface has moved to the "
@@ -235,7 +235,7 @@
 )
 
 DSAPublicKeyWithNumbers = utils.deprecated(
-    dsa.DSAPublicKeyWithNumbers,
+    dsa.DSAPublicKeyWithSerialization,
     __name__,
     (
         "The DSAPublicKeyWithNumbers interface has moved to the "
@@ -310,7 +310,7 @@
 )
 
 RSAPublicKeyWithNumbers = utils.deprecated(
-    rsa.RSAPublicKeyWithNumbers,
+    rsa.RSAPublicKeyWithSerialization,
     __name__,
     (
         "The RSAPublicKeyWithNumbers interface has moved to the "