summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorPhilip Jenvey <pjenvey@underboss.org>2010-04-07 04:04:10 (GMT)
committerPhilip Jenvey <pjenvey@underboss.org>2010-04-07 04:04:10 (GMT)
commit0805ca3f931ccd4735dcaa231752371deadf5ccf (patch)
tree39545abe56278b67c831df94acca0b897c61691f /Misc
parent42dfeec893fb924cb8dda2a0bddf3fd54ab3c9e3 (diff)
downloadcpython-0805ca3f931ccd4735dcaa231752371deadf5ccf.zip
cpython-0805ca3f931ccd4735dcaa231752371deadf5ccf.tar.gz
cpython-0805ca3f931ccd4735dcaa231752371deadf5ccf.tar.bz2
Merged revisions 79878-79880 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r79878 | philip.jenvey | 2010-04-06 16:24:45 -0700 (Tue, 06 Apr 2010) | 4 lines #7301: add the environment variable $PYTHONWARNINGS to supplement the -W command line option patch from Brian Curtin ........ r79879 | benjamin.peterson | 2010-04-06 16:32:27 -0700 (Tue, 06 Apr 2010) | 1 line tell people to update python.man, too ........ r79880 | philip.jenvey | 2010-04-06 16:38:57 -0700 (Tue, 06 Apr 2010) | 1 line document new PYTHONWARNINGS env var ........
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS2
-rw-r--r--Misc/python.man3
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 8de7403..4a2c7fe 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 3.2 Alpha 1?
Core and Builtins
-----------------
+- Issue #7301: Add environment variable $PYTHONWARNINGS.
+
- Issue #8329: Don't return the same lists from select.select when no fds are
changed.
diff --git a/Misc/python.man b/Misc/python.man
index b96c860..157d9d7 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -394,6 +394,9 @@ the \fB\-u\fP option.
If this is set to a non-empty string it is equivalent to specifying
the \fB\-v\fP option. If set to an integer, it is equivalent to
specifying \fB\-v\fP multiple times.
+.IP PYTHONWARNINGS
+If this is set to a comma-separated string it is equivalent to
+specifying the \fB\-W\fP option for each separate value.
.SH AUTHOR
The Python Software Foundation: http://www.python.org/psf
.SH INTERNET RESOURCES