[Python-checkins] cpython (merge 3.3 -> 3.3): Merge heads

Wed Feb 19 18:05:02 CET 2014

http://hg.python.org/cpython/rev/d89178781873
changeset: 89279:d89178781873
branch: 3.3
parent: 89277:b508cbc29acf
parent: 89275:71411d5f3c8b
user: Serhiy Storchaka <storchaka at gmail.com>
date: Wed Feb 19 19:03:58 2014 +0200
summary:
 Merge heads
files:
 Lib/test/test_sys.py | 4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -91,6 +91,10 @@
 self.assertRaises(TypeError, sys.exit, 42, 42)
 
 # call without argument
+ with self.assertRaises(SystemExit) as cm:
+ sys.exit()
+ self.assertIsNone(cm.exception.code)
+
 rc, out, err = assert_python_ok('-c', 'import sys; sys.exit()')
 self.assertEqual(rc, 0)
 self.assertEqual(out, b'')
-- 
Repository URL: http://hg.python.org/cpython
