diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-10-01 01:31:21 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-10-01 01:31:21 (GMT) |
| commit | 811c2f13695049e0b84bfc6ca390bc064b601365 (patch) | |
| tree | e964c0a8a2fb5f1ec1fb3f7c4756b7742c642a80 /Python/ceval.c | |
| parent | c759f3e7ec1ba9753d197d3708b379369586f270 (diff) | |
| download | cpython-811c2f13695049e0b84bfc6ca390bc064b601365.zip cpython-811c2f13695049e0b84bfc6ca390bc064b601365.tar.gz cpython-811c2f13695049e0b84bfc6ca390bc064b601365.tar.bz2 | |
remove "fast-path" for (i)adding strings
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.
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index f6f422e..870d19d 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -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); |