From 3571fbfed7c49895a03b8c0de1fa47a9de112da9 Mon Sep 17 00:00:00 2001 From: Amaury Forgeot d'Arc Date: Mon, 1 Sep 2008 19:52:00 +0000 Subject: [PATCH] Issue #3751: str.rpartition would perform a left-partition when called with a unicode argument. will backport. --- Lib/test/string_tests.py | 5 +++++ Misc/NEWS | 3 +++ Objects/stringobject.c | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py index 3590b8e5b9..63279ec363 100644 --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -1117,6 +1117,9 @@ class MixinStrUnicodeUserStringTest: self.checkraises(ValueError, S, 'partition', '') self.checkraises(TypeError, S, 'partition', None) + # mixed use of str and unicode + self.assertEqual('a/b/c'.partition(u'/'), ('a', '/', 'b/c')) + def test_rpartition(self): self.checkequal(('this is the rparti', 'ti', 'on method'), @@ -1132,6 +1135,8 @@ class MixinStrUnicodeUserStringTest: self.checkraises(ValueError, S, 'rpartition', '') self.checkraises(TypeError, S, 'rpartition', None) + # mixed use of str and unicode + self.assertEqual('a/b/c'.rpartition(u'/'), ('a/b', '/', 'c')) class MixinStrStringUserStringTest: # Additional tests for 8bit strings, i.e. str, UserString and diff --git a/Misc/NEWS b/Misc/NEWS index d8145c37de..6f012ab94d 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ What's New in Python 2.6 release candidate 1? Core and Builtins ----------------- +- Issue #3751: str.rpartition would perform a left-partition when called with + a unicode argument. + - Issue #3683: Fix compilation when --without-threads is given. - Issue #3668: Fix a memory leak with the "s*" argument parser in diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 5bf4add229..b9a70a0c08 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -1638,7 +1638,7 @@ string_rpartition(PyStringObject *self, PyObject *sep_obj) } #ifdef Py_USING_UNICODE else if (PyUnicode_Check(sep_obj)) - return PyUnicode_Partition((PyObject *) self, sep_obj); + return PyUnicode_RPartition((PyObject *) self, sep_obj); #endif else if (PyObject_AsCharBuffer(sep_obj, &sep, &sep_len)) return NULL; -- 2.40.0