diff options
author | Brett Cannon <brett@python.org> | 2014-08-22 10:46:07 -0400 |
---|---|---|
committer | Brett Cannon <brett@python.org> | 2014-08-22 10:46:07 -0400 |
commit | c3acef5ca067b708a64bc182f1ffb2f7e18c73f4 (patch) | |
tree | 6b8eaea094dc34c74d82f8d3a2b35ac34087e83c /Lib/warnings.py | |
parent | 93823c67c94030d6449877cccb4e92abf0d545be (diff) | |
parent | 39c9927a41d830feb11fafcc32de97e58c52d725 (diff) | |
download | cpython-c3acef5ca067b708a64bc182f1ffb2f7e18c73f4.tar.gz |
Merge for issue #22191 fix
Diffstat (limited to 'Lib/warnings.py')
-rw-r--r-- | Lib/warnings.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/warnings.py b/Lib/warnings.py index eeeba65374..e53efa52b0 100644 --- a/Lib/warnings.py +++ b/Lib/warnings.py @@ -163,7 +163,9 @@ def warn(message, category=None, stacklevel=1): # Check category argument if category is None: category = UserWarning - assert issubclass(category, Warning) + if not (isinstance(category, type) and issubclass(category, Warning)): + raise TypeError("category must be a Warning subclass, " + "not '{:s}'".format(type(category).__name__)) # Get context information try: caller = sys._getframe(stacklevel) |