Merged revisions 81250-81253 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r81250 | victor.stinner | 2010-05-17 03:13:37 +0200 (lun., 17 mai 2010) | 2 lines
Issue #6697: Fix a crash if code of "python -c code" contains surrogates
........
r81251 | victor.stinner | 2010-05-17 03:26:01 +0200 (lun., 17 mai 2010) | 3 lines
PyObject_Dump() encodes unicode objects to utf8 with backslashreplace (instead
of strict) error handler to escape surrogates
........
r81252 | victor.stinner | 2010-05-17 10:58:51 +0200 (lun., 17 mai 2010) | 6 lines
handle_system_exit() flushs files to warranty the output order
PyObject_Print() writes into the C object stderr, whereas PySys_WriteStderr()
writes into the Python object sys.stderr. Each object has its own buffer, so
call sys.stderr.flush() and fflush(stderr).
........
r81253 | victor.stinner | 2010-05-17 11:33:42 +0200 (lun., 17 mai 2010) | 6 lines
Fix refleak in internal_print() introduced by myself in r81251
_PyUnicode_AsDefaultEncodedString() uses a magical PyUnicode attribute to
automatically destroy PyUnicode_EncodeUTF8() result when the unicode string is
destroyed.
........
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 2886e77..b3a0676 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -79,6 +79,8 @@
# Python/pythonrun.c::PyErr_PrintEx() is tricky.
def test_exit(self):
+ import subprocess
+
self.assertRaises(TypeError, sys.exit, 42, 42)
# call without argument
@@ -133,11 +135,29 @@
self.fail("no exception")
# test that the exit machinery handles SystemExits properly
- import subprocess
rc = subprocess.call([sys.executable, "-c",
"raise SystemExit(47)"])
self.assertEqual(rc, 47)
+ def check_exit_message(code, expected):
+ process = subprocess.Popen([sys.executable, "-c", code],
+ stderr=subprocess.PIPE)
+ stdout, stderr = process.communicate()
+ self.assertEqual(process.returncode, 1)
+ self.assertTrue(stderr.startswith(expected), stderr)
+
+ # 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 exit message is written with backslashreplace error
+ # handler to stderr
+ check_exit_message(
+ r'import sys; sys.exit("surrogates:\uDCFF")',
+ b"surrogates:\\udcff")
+
def test_getdefaultencoding(self):
self.assertRaises(TypeError, sys.getdefaultencoding, 42)
# can't check more than the type, as the user might have changed it
@@ -403,6 +423,24 @@
self.assertRaises(TypeError, sys.intern, S("abc"))
+ def test_main_invalid_unicode(self):
+ import locale
+ non_decodable = b"\xff"
+ encoding = locale.getpreferredencoding()
+ try:
+ non_decodable.decode(encoding)
+ except UnicodeDecodeError:
+ pass
+ else:
+ self.skipTest('%r is decodable with encoding %s'
+ % (non_decodable, encoding))
+ code = b'print("' + non_decodable + b'")'
+ p = subprocess.Popen([sys.executable, "-c", code], stderr=subprocess.PIPE)
+ stdout, stderr = p.communicate()
+ self.assertEqual(p.returncode, 1)
+ self.assert_(stderr.startswith(b"UnicodeEncodeError: "
+ b"'utf-8' codec can't encode character '\\udcff' in "
+ b"position 7: surrogates not allowed"), stderr)
def test_sys_flags(self):
self.assertTrue(sys.flags)