From: Tim Peters <tim.peters@gmail.com>
Date: Tue, 28 Mar 2006 07:39:22 +0000 (+0000)
Subject: Part of bug 1459808:  fiddle test_input_and_raw_input()
X-Git-Tag: v2.5a0~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b82cb8dcd513d49dc674f6973c984628c14cf045;p=thirdparty%2FPython%2Fcpython.git

Part of bug 1459808:  fiddle test_input_and_raw_input()
so it passes w/ -Qnew.
---

diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 7fdc063f1f97..a05babf2888b 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')