[Python-checkins] r77250 - in python/branches/py3k: Lib/test/string_tests.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Sat Jan  2 22:55:17 2010
New Revision: 77250

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/string_tests.py

Modified: python/branches/py3k/Lib/test/string_tests.py
==============================================================================
--- python/branches/py3k/Lib/test/string_tests.py	(original)
+++ python/branches/py3k/Lib/test/string_tests.py	Sat Jan  2 22:55:17 2010
@@ -194,8 +194,7 @@
                 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 @@
                 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)