mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

remove "fast-path" for (i)adding strings

Browse source 
These were just an artifact of the old unicode concatenation hack and likely
just penalized other kinds of adding. Also, this fixes __(i)add__ on string
subclasses.
This commit is contained in:
Benjamin Peterson 2011-09-30 21:31:21 -04:00
parent c759f3e7ec
commit 811c2f1369
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/test/test_unicode.py
View file

@ -1760,6 +1760,18 @@ class UnicodeTest(string_tests.CommonTest,
self.assertEqual(size, nchar)
self.assertEqual(wchar, nonbmp + '\0')
def test_subclass_add(self):
class S(str):
def __add__(self, o):
return "3"
self.assertEqual(S("4") + S("5"), "3")
class S(str):
def __iadd__(self, o):
return "3"
s = S("1")
s += "4"
self.assertEqual(s, "3")
class StringModuleTest(unittest.TestCase):
def test_formatter_parser(self):

10
Python/ceval.c
View file

@ -1507,10 +1507,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
TARGET(BINARY_ADD)
w = POP();
v = TOP();
if (PyUnicode_Check(v) && PyUnicode_Check(w))
x = PyUnicode_Concat(v, w);
else
x = PyNumber_Add(v, w);
x = PyNumber_Add(v, w);
Py_DECREF(v);
Py_DECREF(w);
SET_TOP(x);
@ -1662,10 +1659,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
TARGET(INPLACE_ADD)
w = POP();
v = TOP();
if (PyUnicode_Check(v) && PyUnicode_Check(w))
x = PyUnicode_Concat(v, w);
else
x = PyNumber_InPlaceAdd(v, w);
x = PyNumber_InPlaceAdd(v, w);
Py_DECREF(v);
Py_DECREF(w);
SET_TOP(x);