merge 3.3 (#20507)

4267869a · Benjamin Peterson · 504f6e86 · 9743b2c2 · 4267869a
Commit 4267869a authored Feb 15, 2014 by Benjamin Peterson
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Objects/unicodeobject.c Objects/unicodeobject.c +1 -1

No files found.
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9666,7 +9666,7 @@ PyUnicode_Join(PyObject *separator, PyObject *seq)
    PyObject *last_obj;
    unsigned int kind = 0;
-    fseq = PySequence_Fast(seq, "");
+    fseq = PySequence_Fast(seq, "can only join an iterable");
    if (fseq == NULL) {
        return NULL;
    }