From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 2 Jan 2010 21:55:17 +0000 (+0000)
Subject: Merged revisions 77249 via svnmerge from
X-Git-Tag: v3.2a1~1915
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e544fb19834da15eed4800a91e26a61e4ae91d7;p=python

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 4964248ead..922f62f623 100644
--- 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)