diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 12:52:29 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 12:52:29 (GMT) |
| commit | aabbda5354407cfe35097c7f17717a716a3d80c4 (patch) | |
| tree | e15e7fe42975e08e567879ec8a949d4986ca4493 /Lib/warnings.py | |
| parent | ac73b0c95e352563ecf0a4643b30215b9bdee1a5 (diff) | |
| parent | 5d1155c08edf7f53eca804b2b6538636c2dfe711 (diff) | |
| download | cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.zip cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.gz cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.bz2 | |
Merge 3.2
Diffstat (limited to 'Lib/warnings.py')
| -rw-r--r-- | Lib/warnings.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/warnings.py b/Lib/warnings.py index 5b5821b..edbbb5e 100644 --- a/Lib/warnings.py +++ b/Lib/warnings.py @@ -259,7 +259,7 @@ def warn_explicit(message, category, filename, lineno, raise RuntimeError( "Unrecognized action (%r) in warnings.filters:\n %s" % (action, item)) - if not hasattr(showwarning, "__call__"): + if not callable(showwarning): raise TypeError("warnings.showwarning() must be set to a " "function or method") # Print message and context |