[Python-checkins] r43382 - python/trunk/Lib/test/test_builtin.py

Tue Mar 28 09:39:22 CEST 2006

Author: tim.peters
Date: Tue Mar 28 09:39:22 2006
New Revision: 43382
Modified:
 python/trunk/Lib/test/test_builtin.py
Log:
Part of bug 1459808: fiddle test_input_and_raw_input()
so it passes w/ -Qnew.
Modified: python/trunk/Lib/test/test_builtin.py
==============================================================================

--- python/trunk/Lib/test/test_builtin.py	(original)
+++ python/trunk/Lib/test/test_builtin.py	Tue Mar 28 09:39:22 2006
@@ -1295,8 +1295,16 @@
 'test_builtin_tmp', 'exec')
 sys.stdin.seek(0, 0)
 exec compile('print input()', 'test_builtin_tmp', 'exec')
- self.assertEqual(sys.stdout.getvalue().splitlines(),
- ['0', '0.5', '0'])
+ # The result we expect depends on whether new division semantics
+ # are already in effect.
+ if 1/2 == 0:
+ # This test was compiled with old semantics.
+ expected = ['0', '0.5', '0']
+ else:
+ # This test was compiled with new semantics (e.g., -Qnew
+ # was given on the command line.
+ expected = ['0.5', '0.5', '0.5']
+ self.assertEqual(sys.stdout.getvalue().splitlines(), expected)
 
 del sys.stdout
 self.assertRaises(RuntimeError, input, 'prompt')
