Merged revisions 81537 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81537 | victor.stinner | 2010-05-26 00:30:32 +0200 (mer., 26 mai 2010) | 3 lines
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
........
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 5c18006..980606d 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -173,6 +173,26 @@
"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: