Backport checkin:

Fix test failure message (from SF patch #885008)

diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index f39c51a4d03a28acde1df9c3ff9cf16adcc9aa59..242ca018888880021921b7f11a968af1c0436b17 100644 (file)
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -32,7 +32,7 @@ if not x: raise TestFailed, 'x is false instead of true'
 print '6.2 Boolean operations'
 if 0 or 0: raise TestFailed, '0 or 0 is true instead of false'
 if 1 and 1: pass
-else: raise TestFailed, '1 and 1 is false instead of false'
+else: raise TestFailed, '1 and 1 is false instead of true'
 if not 1: raise TestFailed, 'not 1 is true instead of false'
 
 print '6.3 Comparisons'