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.
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 @@
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 @@
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);