summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_builtin.py
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2006-03-28 07:39:22 (GMT)
committerTim Peters <tim.peters@gmail.com>2006-03-28 07:39:22 (GMT)
commitb82cb8dcd513d49dc674f6973c984628c14cf045 (patch)
tree573f4f3ad00c75e4ee6ce7105f62da14d5e1e323 /Lib/test/test_builtin.py
parent1c5bc1c9d7a4a0d0670565bc03dd9354f9fe2fe5 (diff)
downloadcpython-b82cb8dcd513d49dc674f6973c984628c14cf045.zip
cpython-b82cb8dcd513d49dc674f6973c984628c14cf045.tar.gz
cpython-b82cb8dcd513d49dc674f6973c984628c14cf045.tar.bz2
Part of bug 1459808: fiddle test_input_and_raw_input()
so it passes w/ -Qnew.
Diffstat (limited to 'Lib/test/test_builtin.py')
-rw-r--r--Lib/test/test_builtin.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 7fdc063..a05babf 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -1295,8 +1295,16 @@ class BuiltinTest(unittest.TestCase):
'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')