Skip to content

gh-125893: Add type check for category argument in warnings.simplefilter and warnings.filterwarning #136305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions Lib/_py_warnings.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,19 @@ def _formatwarnmsg(msg):
msg.filename, msg.lineno, msg.line)
return _wm._formatwarnmsg_impl(msg)

def _valid_warning_category(category):
"""
Return True if category is a Warning subclass or tuple of such.
Always perform class checks; only perform tuple iteration in debug mode.
"""
if isinstance(category, type) and issubclass(category, Warning):
return True
if isinstance(category, tuple):
if __debug__:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd still consider the isinstance checks above to be expensive. Could you move this __debug__ check to before any calls to isinstance?

return all(isinstance(c, type) and issubclass(c, Warning)
for c in category)
return True
return False

def filterwarnings(action, message="", category=Warning, module="", lineno=0,
append=False):
Expand All @@ -267,8 +280,9 @@ def filterwarnings(action, message="", category=Warning, module="", lineno=0,
raise ValueError(f"invalid action: {action!r}")
if not isinstance(message, str):
raise TypeError("message must be a string")
if not isinstance(category, type) or not issubclass(category, Warning):
raise TypeError("category must be a Warning subclass")
if not _valid_warning_category(category):
raise TypeError("category must be a Warning subclass, "
"not '{:s}'".format(type(category).__name__))
if not isinstance(module, str):
raise TypeError("module must be a string")
if not isinstance(lineno, int):
Expand Down Expand Up @@ -303,6 +317,9 @@ def simplefilter(action, category=Warning, lineno=0, append=False):
"""
if action not in {"error", "ignore", "always", "all", "default", "module", "once"}:
raise ValueError(f"invalid action: {action!r}")
if not _valid_warning_category(category):
raise TypeError("category must be a Warning subclass, "
"not '{:s}'".format(type(category).__name__))
if not isinstance(lineno, int):
raise TypeError("lineno must be an int")
if lineno < 0:
Expand Down
27 changes: 27 additions & 0 deletions Lib/test/test_warnings/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,33 @@ def test_argument_validation(self):
with self.assertRaises(ValueError):
self.module.simplefilter('ignore', lineno=-1)

def test_invalid_category_types(self):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably need to skip this if we're not in debug mode, so add something like @unittest.skipUnless(__debug__, ...).

with self.assertRaises(TypeError):
self.module.filterwarnings("ignore", category="notawarning")
with self.assertRaises(TypeError):
self.module.filterwarnings("ignore", category=123)
with self.assertRaises(TypeError):
self.module.filterwarnings("ignore", category=17.02)
with self.assertRaises(TypeError):
self.module.filterwarnings("ignore", category=True)
with self.assertRaises(TypeError):
self.module.filterwarnings(
"ignore", category=(UserWarning, 17)
)

with self.assertRaises(TypeError):
self.module.simplefilter("ignore", category="notawarning")
with self.assertRaises(TypeError):
self.module.simplefilter("ignore", category=123)
with self.assertRaises(TypeError):
self.module.filterwarnings("ignore", category=17.02)
with self.assertRaises(TypeError):
self.module.filterwarnings("ignore", category=True)
with self.assertRaises(TypeError):
self.module.simplefilter(
"ignore", category=(UserWarning, 'abc')
)

def test_catchwarnings_with_simplefilter_ignore(self):
with self.module.catch_warnings(module=self.module):
self.module.resetwarnings()
Expand Down
1 change: 1 addition & 0 deletions Misc/ACKS
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Emmanuel Arias
Alicia Arlen
Jeffrey Armstrong
Justin Turner Arthur
Hasrat Ali Arzoo
Jason Asbahr
David Ascher
Ammar Askar
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Added validation for the ``category`` argument in
``warnings.filterwarnings()`` and ``warnings.simplefilter()``
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sphinx markup:

Suggested change
``warnings.filterwarnings()`` and ``warnings.simplefilter()``
:func:`warnings.filterwarnings()` and :func:`warnings.simplefilter()`.

Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy