summaryrefslogtreecommitdiff
path: root/Lib/test/string_tests.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-01-02 21:55:17 +0000
committerAntoine Pitrou <solipsis@pitrou.net>2010-01-02 21:55:17 +0000
commit2e544fb19834da15eed4800a91e26a61e4ae91d7 (patch)
tree823fc89833f83d209e7f557de948c302bc84932d /Lib/test/string_tests.py
parent74edda01a119ed8ecd1702940db2b2f09f05d022 (diff)
downloadcpython-git-2e544fb19834da15eed4800a91e26a61e4ae91d7.tar.gz
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. ........
Diffstat (limited to 'Lib/test/string_tests.py')
-rw-r--r--Lib/test/string_tests.py6
1 files changed, 2 insertions, 4 deletions
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)