diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/collections.py | 2 | ||||
| -rw-r--r-- | Lib/test/string_tests.py | 24 |
2 files changed, 26 insertions, 0 deletions
diff --git a/Lib/collections.py b/Lib/collections.py index f255919..3e01054 100644 --- a/Lib/collections.py +++ b/Lib/collections.py @@ -767,6 +767,8 @@ class UserString(Sequence): new = new.data return self.__class__(self.data.replace(old, new, maxsplit)) def rfind(self, sub, start=0, end=_sys.maxsize): + if isinstance(sub, UserString): + sub = sub.data return self.data.rfind(sub, start, end) def rindex(self, sub, start=0, end=_sys.maxsize): return self.data.rindex(sub, start, end) diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py index 85e52f3..ea49e38 100644 --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -216,6 +216,30 @@ class BaseTest(unittest.TestCase): self.checkraises(TypeError, 'hello', 'rfind') self.checkraises(TypeError, 'hello', 'rfind', 42) + # For a variety of combinations, + # verify that str.rfind() matches __contains__ + # and that the found substring is really at that location + charset = ['', 'a', 'b', 'c'] + digits = 5 + base = len(charset) + teststrings = set() + for i in range(base ** digits): + entry = [] + for j in range(digits): + i, m = divmod(i, base) + entry.append(charset[m]) + teststrings.add(''.join(entry)) + teststrings = [self.fixtype(ts) for ts in teststrings] + for i in teststrings: + for j in teststrings: + 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) + def test_index(self): self.checkequal(0, 'abcdefghiabc', 'index', '') self.checkequal(3, 'abcdefghiabc', 'index', 'def') |