summaryrefslogtreecommitdiffstats
path: root/Objects/stringobject.c
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2006-06-10 06:40:50 (GMT)
committerGeorg Brandl <georg@python.org>2006-06-10 06:40:50 (GMT)
commit90e27d38f5ec7c435d32e1eebe0b7a3ad6b60216 (patch)
tree157132e2091bf19d163e1f49a43905f7a06b0306 /Objects/stringobject.c
parent6946ea0be032c17689ee35d3281060b8fe662471 (diff)
downloadcpython-90e27d38f5ec7c435d32e1eebe0b7a3ad6b60216.zip
cpython-90e27d38f5ec7c435d32e1eebe0b7a3ad6b60216.tar.gz
cpython-90e27d38f5ec7c435d32e1eebe0b7a3ad6b60216.tar.bz2
Apply perky's fix for #1503157: "/".join([u"", u""]) raising OverflowError.
Also improve error message on overflow.
Diffstat (limited to 'Objects/stringobject.c')
-rw-r--r--Objects/stringobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 831d54a..a5c8cc2 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1788,7 +1788,7 @@ string_join(PyStringObject *self, PyObject *orig)
sz += seplen;
if (sz < old_sz || sz > PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError,
- "join() is too long for a Python string");
+ "join() result is too long for a Python string");
Py_DECREF(seq);
return NULL;
}