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.
........

Lib/test/string_tests.py

@@ -194,7 +194,6 @@ class BaseTest(unittest.TestCase):
                 loc = i.find(j)
                 r1 = (loc != -1)
                 r2 = j in i
-                if r1 != r2:
                 self.assertEqual(r1, r2)
                 if loc != -1:
                     self.assertEqual(i[loc:loc+len(j)], j)
@@ -238,7 +237,6 @@ class BaseTest(unittest.TestCase):
                 loc = i.rfind(j)
                 r1 = (loc != -1)
                 r2 = j in i
-                if r1 != r2:
                 self.assertEqual(r1, r2)
                 if loc != -1:
                     self.assertEqual(i[loc:loc+len(j)], j)