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
........

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 0978770e1a4db3903369cedef31cea44e72b4151..e0f3a3ac45c7373e8b522a4920912825de18083f 100644 (file)
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -1,5 +1,8 @@
 .. highlightlang:: none
 
+.. ATTENTION: You probably should update Misc/python.man, too, if you modify
+.. this file.
+
 .. _using-on-general:
 
 Command line and environment
@@ -306,6 +309,8 @@ Miscellaneous options
 
       :pep:`230` -- Warning framework
 
+      :envvar:`PYTHONWARNINGS`
+
 
 .. cmdoption:: -x
 
@@ -469,6 +474,12 @@ These environment variables influence Python's behavior.
    value instead of the value got through the C runtime.  Only works on
    Mac OS X.
 
+.. envvar:: PYTHONWARNINGS
+
+   This is the equivalent to the :option:`-W` option. If set to a comma
+   separated string, it is equivalent to specifying :option:`-W` multiple
+   times.
+
 
 Debug-mode variables
 ~~~~~~~~~~~~~~~~~~~~

diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py
index 7bd71914b4a14d91db717fe094c9133556946003..fa83fca42a0c9d41764aabf08bf8e8d9fe9a8a24 100644 (file)
--- a/Lib/test/test_warnings.py
+++ b/Lib/test/test_warnings.py
@@ -4,6 +4,7 @@ import os
 from io import StringIO
 import sys
 import unittest
+import subprocess
 from test import support
 
 from test import warning_tests
@@ -685,6 +686,42 @@ class PyCatchWarningTests(CatchWarningTests):
     module = py_warnings
 
 
+class EnvironmentVariableTests(BaseTest):
+
+    def test_single_warning(self):
+        newenv = os.environ.copy()
+        newenv["PYTHONWARNINGS"] = "ignore::DeprecationWarning"
+        p = subprocess.Popen([sys.executable,
+                "-c", "import sys; sys.stdout.write(str(sys.warnoptions))"],
+                stdout=subprocess.PIPE, env=newenv)
+        self.assertEqual(p.stdout.read(), b"['ignore::DeprecationWarning']")
+
+    def test_comma_separated_warnings(self):
+        newenv = os.environ.copy()
+        newenv["PYTHONWARNINGS"] = ("ignore::DeprecationWarning,"
+                                    "ignore::UnicodeWarning")
+        p = subprocess.Popen([sys.executable,
+                "-c", "import sys; sys.stdout.write(str(sys.warnoptions))"],
+                stdout=subprocess.PIPE, env=newenv)
+        self.assertEqual(p.stdout.read(),
+                b"['ignore::DeprecationWarning', 'ignore::UnicodeWarning']")
+
+    def test_envvar_and_command_line(self):
+        newenv = os.environ.copy()
+        newenv["PYTHONWARNINGS"] = "ignore::DeprecationWarning"
+        p = subprocess.Popen([sys.executable, "-W" "ignore::UnicodeWarning",
+                "-c", "import sys; sys.stdout.write(str(sys.warnoptions))"],
+                stdout=subprocess.PIPE, env=newenv)
+        self.assertEqual(p.stdout.read(),
+                b"['ignore::UnicodeWarning', 'ignore::DeprecationWarning']")
+
+class CEnvironmentVariableTests(EnvironmentVariableTests):
+    module = c_warnings
+
+class PyEnvironmentVariableTests(EnvironmentVariableTests):
+    module = py_warnings
+
+
 def test_main():
     py_warnings.onceregistry.clear()
     c_warnings.onceregistry.clear()
@@ -696,6 +733,8 @@ def test_main():
                                 _WarningsTests,
                                 CWarningsDisplayTests, PyWarningsDisplayTests,
                                 CCatchWarningTests, PyCatchWarningTests,
+                                CEnvironmentVariableTests,
+                                PyEnvironmentVariableTests
                              )
 
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 8de7403602a2536deed45cf836de7a6ca4c37c16..4a2c7feab1b3f51dc0164df3d7b64d610d953876 100644 (file)
--- 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 b96c8608b14f786472766816ebffb26f6e6f6222..157d9d7ce19f455856c6cf18384c0e159b290a16 100644 (file)
--- 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

diff --git a/Modules/main.c b/Modules/main.c
index 7736d99dfda8bb4df19517afb3ebbd03fe05f9b7..95fae17f832a046bed3bd37cf320e3eed726ac92 100644 (file)
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -82,6 +82,7 @@ static char *usage_3 = "\
          can be supplied multiple times to increase verbosity\n\
 -V     : print the Python version number and exit (also --version)\n\
 -W arg : warning control; arg is action:message:category:module:lineno\n\
+         also PYTHONWARNINGS=arg\n\
 -x     : skip first line of source, allowing use of non-Unix forms of #!cmd\n\
 ";
 static char *usage_4 = "\
@@ -401,6 +402,24 @@ Py_Main(int argc, wchar_t **argv)
            (p = Py_GETENV("PYTHONNOUSERSITE")) && *p != '\0')
                Py_NoUserSiteDirectory = 1;
 
+       if ((p = Py_GETENV("PYTHONWARNINGS")) && *p != '\0') {
+               char *buf;
+               wchar_t *warning;
+               size_t len;
+
+               for (buf = strtok(p, ",");
+                    buf != NULL;
+                    buf = strtok(NULL, ",")) {
+                       len = strlen(buf);
+                       warning = (wchar_t *)malloc((len + 1) * sizeof(wchar_t));
+                       if (warning == NULL)
+                               Py_FatalError(
+                                  "not enough memory to copy PYTHONWARNINGS");
+                       mbstowcs(warning, buf, len);
+                       PySys_AddWarnOption(warning);
+               }
+       }
+
        if (command == NULL && module == NULL && _PyOS_optind < argc &&
            wcscmp(argv[_PyOS_optind], L"-") != 0)
        {