aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-05-25 22:30:32 +0000
committerVictor Stinner <victor.stinner@haypocalc.com>2010-05-25 22:30:32 +0000
commitc49dfcc8dcf5aec3151f7a76fd860ce0247f9bf9 (patch)
tree0a895906ec8058f18419b4a5cd19d7747d8f6280
parentAdd Alexander Belopolsky. (diff)
downloadcpython-c49dfcc8dcf5aec3151f7a76fd860ce0247f9bf9.tar.gz
cpython-c49dfcc8dcf5aec3151f7a76fd860ce0247f9bf9.tar.bz2
cpython-c49dfcc8dcf5aec3151f7a76fd860ce0247f9bf9.zip
Issue #3798: Write sys.exit() message to sys.stderr to use stderr encoding and
error handler, instead of writing to the C stderr file in utf-8
-rw-r--r--Lib/test/test_sys.py20
-rw-r--r--Misc/NEWS3
-rw-r--r--Python/pythonrun.c8
3 files changed, 30 insertions, 1 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 17208753beb..b17827cd66d 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -178,6 +178,26 @@ class SysModuleTest(unittest.TestCase):
"raise SystemExit(47)"])
self.assertEqual(rc, 47)
+ def check_exit_message(code, expected, env=None):
+ process = subprocess.Popen([sys.executable, "-c", code],
+ stderr=subprocess.PIPE, env=env)
+ stdout, stderr = process.communicate()
+ self.assertEqual(process.returncode, 1)
+ self.assertTrue(stderr.startswith(expected),
+ "%s doesn't start with %s" % (repr(stderr), repr(expected)))
+
+ # test that stderr buffer if flushed before the exit message is written
+ # into stderr
+ check_exit_message(
+ r'import sys; sys.stderr.write("unflushed,"); sys.exit("message")',
+ b"unflushed,message")
+
+ # test that the unicode message is encoded to the stderr encoding
+ env = os.environ.copy()
+ env['PYTHONIOENCODING'] = 'latin-1'
+ check_exit_message(
+ r'import sys; sys.exit(u"h\xe9")',
+ b"h\xe9", env=env)
def test_getdefaultencoding(self):
if test.test_support.have_unicode:
diff --git a/Misc/NEWS b/Misc/NEWS
index 9d693786404..e1b82a685d7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.7 Release Candidate 1?
Core and Builtins
-----------------
+- Issue #3798: Write sys.exit() message to sys.stderr to use stderr encoding
+ and error handler, instead of writing to the C stderr file in utf-8
+
- Issue #7902: When using explicit relative import syntax, don't try implicit
relative import semantics.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index f203618c423..db5d0a7a189 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1106,7 +1106,13 @@ handle_system_exit(void)
if (PyInt_Check(value))
exitcode = (int)PyInt_AsLong(value);
else {
- PyObject_Print(value, stderr, Py_PRINT_RAW);
+ PyObject *sys_stderr = PySys_GetObject("stderr");
+ if (sys_stderr != NULL && sys_stderr != Py_None) {
+ PyFile_WriteObject(value, sys_stderr, Py_PRINT_RAW);
+ } else {
+ PyObject_Print(value, stderr, Py_PRINT_RAW);
+ fflush(stderr);
+ }
PySys_WriteStderr("\n");
exitcode = 1;
}