commit 1c851f63c55835961ce12d7d40131b45928761f1
author Paul Kehrer <paul.l.kehrer@gmail.com> Sat May 03 12:52:06 2014 -0500
committer Paul Kehrer <paul.l.kehrer@gmail.com> Sat May 03 12:52:06 2014 -0500
tree 48c5e78e92d14ddca10f1c5e33bc0c44676ece25
parent a323edef54572ef968b86d3e2f442433df519e36
parent 18e036d6230b63bddceadfe99d303bab6b14d266

Merge pull request #1007 from alex/warning-stacklevel

Warn at the right stacklevel

cryptography/hazmat/primitives/asymmetric/padding.py

diff --git a/cryptography/hazmat/primitives/asymmetric/padding.py b/cryptography/hazmat/primitives/asymmetric/padding.py
index dcc6fe0..f7710c4 100644
--- a/cryptography/hazmat/primitives/asymmetric/padding.py
+++ b/cryptography/hazmat/primitives/asymmetric/padding.py
@@ -38,7 +38,8 @@
             warnings.warn(
                 "salt_length is deprecated on MGF1 and should be added via the"
                 " PSS constructor.",
-                utils.DeprecatedIn04
+                utils.DeprecatedIn04,
+                stacklevel=2
             )
         else:
             if (not isinstance(salt_length, six.integer_types) and
@@ -80,7 +81,8 @@
             warnings.warn(
                 "salt_length is deprecated on MGF1 and should be passed to "
                 "the PSS constructor instead.",
-                utils.DeprecatedIn04
+                utils.DeprecatedIn04,
+                stacklevel=2
             )
             if (not isinstance(salt_length, six.integer_types) and
                     salt_length is not self.MAX_LENGTH):