Merged revisions 77249 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77249 | antoine.pitrou | 2010-01-02 22:53:44 +0100 (sam., 02 janv. 2010) | 3 lines

  Remove silly conditional.
........

diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py
index 4964248eade3dc4d80dda87a0c4bf5e08dddb367..922f62f623fe97205bd3bd00c2886d6b0959a6ef 100644 (file)
--- a/Lib/test/string_tests.py
+++ b/Lib/test/string_tests.py
@@ -194,8 +194,7 @@ class BaseTest(unittest.TestCase):
                 loc = i.find(j)
                 r1 = (loc != -1)
                 r2 = j in i
-                if r1 != r2:
-                    self.assertEqual(r1, r2)
+                self.assertEqual(r1, r2)
                 if loc != -1:
                     self.assertEqual(i[loc:loc+len(j)], j)
 
@@ -238,8 +237,7 @@ class BaseTest(unittest.TestCase):
                 loc = i.rfind(j)
                 r1 = (loc != -1)
                 r2 = j in i
-                if r1 != r2:
-                    self.assertEqual(r1, r2)
+                self.assertEqual(r1, r2)
                 if loc != -1:
                     self.assertEqual(i[loc:loc+len(j)], j)