From ad6139acc79271fd954d1f138235584a7d66c119 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 11 Apr 2010 21:16:33 +0000 Subject: Merged revisions 79936 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79936 | philip.jenvey | 2010-04-10 15:27:15 -0500 (Sat, 10 Apr 2010) | 3 lines fix PYTHONWARNINGS handling to not modify the original env value and improve its tests ........ --- Lib/test/test_warnings.py | 9 ++++++--- Modules/main.c | 31 ++++++++++++++++++------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py index fa83fca..ca733f7 100644 --- a/Lib/test/test_warnings.py +++ b/Lib/test/test_warnings.py @@ -694,7 +694,8 @@ class EnvironmentVariableTests(BaseTest): 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']") + self.assertEqual(p.communicate()[0], b"['ignore::DeprecationWarning']") + self.assertEqual(p.wait(), 0) def test_comma_separated_warnings(self): newenv = os.environ.copy() @@ -703,8 +704,9 @@ class EnvironmentVariableTests(BaseTest): p = subprocess.Popen([sys.executable, "-c", "import sys; sys.stdout.write(str(sys.warnoptions))"], stdout=subprocess.PIPE, env=newenv) - self.assertEqual(p.stdout.read(), + self.assertEqual(p.communicate()[0], b"['ignore::DeprecationWarning', 'ignore::UnicodeWarning']") + self.assertEqual(p.wait(), 0) def test_envvar_and_command_line(self): newenv = os.environ.copy() @@ -712,8 +714,9 @@ class EnvironmentVariableTests(BaseTest): 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(), + self.assertEqual(p.communicate()[0], b"['ignore::UnicodeWarning', 'ignore::DeprecationWarning']") + self.assertEqual(p.wait(), 0) class CEnvironmentVariableTests(EnvironmentVariableTests): module = c_warnings diff --git a/Modules/main.c b/Modules/main.c index 5ae82ef..88912c1 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -403,22 +403,27 @@ Py_Main(int argc, wchar_t **argv) 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) + char *buf, *warning; + + buf = (char *)malloc(strlen(p) + 1); + if (buf == NULL) + Py_FatalError( + "not enough memory to copy PYTHONWARNINGS"); + strcpy(buf, p); + for (warning = strtok(buf, ","); + warning != NULL; + warning = strtok(NULL, ",")) { + wchar_t *wide_warning; + size_t len = strlen(buf); + wide_warning = (wchar_t *)malloc((len + 1) * sizeof(wchar_t)); + if (wide_warning == NULL) Py_FatalError( "not enough memory to copy PYTHONWARNINGS"); - mbstowcs(warning, buf, len); - PySys_AddWarnOption(warning); - free(warning); + mbstowcs(wide_warning, warning, len); + PySys_AddWarnOption(wide_warning); + free(wide_warning); } + free(buf); } if (command == NULL && module == NULL && _PyOS_optind < argc && -- cgit v0.12