traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

str.replace(a, a) is now returning str unchanged if a is a

This commit is contained in:
Victor Stinner 2011-10-07 10:01:28 +02:00
parent 72ca65dce4
commit 59de0ee9e0
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_unicode.py
View File

@ -275,6 +275,12 @@ class UnicodeTest(string_tests.CommonTest,
self.checkequalnofix('one@two!three!', 'one!two!three!', 'replace', '!', '@', 1) self.checkequalnofix('one@two!three!', 'one!two!three!', 'replace', '!', '@', 1)
self.assertRaises(TypeError, 'replace'.replace, "r", 42) self.assertRaises(TypeError, 'replace'.replace, "r", 42)
@support.cpython_only
def test_replace_id(self):
a = 'a' # single ascii letters are singletons
text = 'abc'
self.assertIs(text.replace('a', 'a'), text)
def test_bytes_comparison(self): def test_bytes_comparison(self):
with support.check_warnings(): with support.check_warnings():
warnings.simplefilter('ignore', BytesWarning) warnings.simplefilter('ignore', BytesWarning)

2
Objects/unicodeobject.c
View File

@ -9604,6 +9604,8 @@ replace(PyObject *self, PyObject *str1,
else if (maxcount == 0 || slen == 0) else if (maxcount == 0 || slen == 0)
goto nothing; goto nothing;
if (str1 == str2)
goto nothing;
if (skind < kind1) if (skind < kind1)
/* substring too wide to be present */ /* substring too wide to be present */
goto nothing; goto nothing;