summaryrefslogtreecommitdiffstats
path: root/Lib/collections.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-01-02 21:40:36 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-01-02 21:40:36 (GMT)
commitda2ecaf3349d564ef0392183d86270eea5cdb439 (patch)
treed30ed807e0e325a492f999576bf19fd370b0dbda /Lib/collections.py
parent2952148dd246b67ca88a68c44819a208d0d6624a (diff)
downloadcpython-da2ecaf3349d564ef0392183d86270eea5cdb439.zip
cpython-da2ecaf3349d564ef0392183d86270eea5cdb439.tar.gz
cpython-da2ecaf3349d564ef0392183d86270eea5cdb439.tar.bz2
Merged revisions 77241 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77241 | antoine.pitrou | 2010-01-02 22:12:58 +0100 (sam., 02 janv. 2010) | 4 lines Issue #7462: Implement the stringlib fast search algorithm for the `rfind`, `rindex`, `rsplit` and `rpartition` methods. Patch by Florent Xicluna. ........
Diffstat (limited to 'Lib/collections.py')
-rw-r--r--Lib/collections.py2
1 files changed, 2 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)