#4351: more appropriate DeprecationWarning stacklevels

diff --git a/Lib/cgi.py b/Lib/cgi.py
index 35f69961403479506e22f2e6f64c340608e1100d..9e16a1df6237d20f567990c6f70793538503b3b6 100755 (executable)
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -163,13 +163,13 @@ def parse(fp=None, environ=os.environ, keep_blank_values=0, strict_parsing=0):
 def parse_qs(qs, keep_blank_values=0, strict_parsing=0):
     """Parse a query given as a string argument."""
     warn("cgi.parse_qs is deprecated, use urllib.parse.parse_qs instead",
-            DeprecationWarning)
+         DeprecationWarning, 2)
     return urllib.parse.parse_qs(qs, keep_blank_values, strict_parsing)
 
 def parse_qsl(qs, keep_blank_values=0, strict_parsing=0):
     """Parse a query given as a string argument."""
     warn("cgi.parse_qsl is deprecated, use urllib.parse.parse_qsl instead",
-            DeprecationWarning)
+         DeprecationWarning, 2)
     return urllib.parse.parse_qsl(qs, keep_blank_values, strict_parsing)
 
 def parse_multipart(fp, pdict):

diff --git a/Lib/gzip.py b/Lib/gzip.py
index 019c3e2df1f1e0d5862922c05f60b5350664082c..983e0cee07f0fc8be648b9991ef60c31b14d3285 100644 (file)
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -136,7 +136,7 @@ class GzipFile:
     @property
     def filename(self):
         import warnings
-        warnings.warn("use the name attribute", DeprecationWarning)
+        warnings.warn("use the name attribute", DeprecationWarning, 2)
         if self.mode == WRITE and self.name[-3:] != ".gz":
             return self.name + ".gz"
         return self.name

diff --git a/Lib/plistlib.py b/Lib/plistlib.py
index 0cd32ad95b95011671a211dbc37a33245973d8f7..2084b5f505ec015d07628a1c6d422090cd60b316 100644 (file)
--- a/Lib/plistlib.py
+++ b/Lib/plistlib.py
@@ -263,13 +263,13 @@ class _InternalDict(dict):
             raise AttributeError(attr)
         from warnings import warn
         warn("Attribute access from plist dicts is deprecated, use d[key] "
-             "notation instead", PendingDeprecationWarning)
+             "notation instead", PendingDeprecationWarning, 2)
         return value
 
     def __setattr__(self, attr, value):
         from warnings import warn
         warn("Attribute access from plist dicts is deprecated, use d[key] "
-             "notation instead", PendingDeprecationWarning)
+             "notation instead", PendingDeprecationWarning, 2)
         self[attr] = value
 
     def __delattr__(self, attr):
@@ -279,14 +279,14 @@ class _InternalDict(dict):
             raise AttributeError(attr)
         from warnings import warn
         warn("Attribute access from plist dicts is deprecated, use d[key] "
-             "notation instead", PendingDeprecationWarning)
+             "notation instead", PendingDeprecationWarning, 2)
 
 class Dict(_InternalDict):
 
     def __init__(self, **kwargs):
         from warnings import warn
         warn("The plistlib.Dict class is deprecated, use builtin dict instead",
-             PendingDeprecationWarning)
+             PendingDeprecationWarning, 2)
         super().__init__(**kwargs)
 
 
@@ -299,7 +299,7 @@ class Plist(_InternalDict):
     def __init__(self, **kwargs):
         from warnings import warn
         warn("The Plist class is deprecated, use the readPlist() and "
-             "writePlist() functions instead", PendingDeprecationWarning)
+             "writePlist() functions instead", PendingDeprecationWarning, 2)
         super().__init__(**kwargs)
 
     def fromFile(cls, pathOrFile):

diff --git a/Lib/string.py b/Lib/string.py
index 8667c0ee69eeed671ab1f763e2955bcd6dc45f6b..e071a2d1b23edea366504078091da5b410c8c434 100644 (file)
--- a/Lib/string.py
+++ b/Lib/string.py
@@ -51,7 +51,7 @@ def maketrans(frm: bytes, to: bytes) -> bytes:
     """
     import warnings
     warnings.warn("string.maketrans is deprecated, use bytes.maketrans instead",
-                  DeprecationWarning)
+                  DeprecationWarning, 2)
     if len(frm) != len(to):
         raise ValueError("maketrans arguments must have same length")
     if not (isinstance(frm, bytes) and isinstance(to, bytes)):