summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2011-07-18 02:25:50 (GMT)
committerBrett Cannon <brett@python.org>2011-07-18 02:25:50 (GMT)
commite52181c05af4b5cbe6951dce8440ed4d76f11726 (patch)
treea4b788d84aec40fd6ceab5d59995f1401f01b54e
parent52a7d982736fd4111b7937c4e575adb1a39f8afa (diff)
downloadcpython-e52181c05af4b5cbe6951dce8440ed4d76f11726.zip
cpython-e52181c05af4b5cbe6951dce8440ed4d76f11726.tar.gz
cpython-e52181c05af4b5cbe6951dce8440ed4d76f11726.tar.bz2
Add Misc/NEWS entry and relevant doc change for issue 10271.
-rw-r--r--Doc/library/warnings.rst3
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst
index 8af19a2..8387f5a 100644
--- a/Doc/library/warnings.rst
+++ b/Doc/library/warnings.rst
@@ -339,8 +339,7 @@ Available Functions
Write a warning to a file. The default implementation calls
``formatwarning(message, category, filename, lineno, line)`` and writes the
resulting string to *file*, which defaults to ``sys.stderr``. You may replace
- this function with an alternative implementation by assigning to
- ``warnings.showwarning``.
+ this function with any callable by assigning to ``warnings.showwarning``.
*line* is a line of source code to be included in the warning
message; if *line* is not supplied, :func:`showwarning` will
try to read the line specified by *filename* and *lineno*.
diff --git a/Misc/NEWS b/Misc/NEWS
index 3301d3f..a456bf3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@ What's New in Python 3.3 Alpha 1?
Core and Builtins
-----------------
+- Issue #10271: Allow warnings.showwarning() be any callable.
+
- Issue #11627: Fix segfault when __new__ on a exception returns a non-exception
class.