diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-02-15 18:03:20 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-02-15 18:03:20 (GMT) |
| commit | 4267869ad892520ef26dc403b988ef6b5b3fe428 (patch) | |
| tree | 5aae5f51aa0a8ee808841152409b48e51d3cf870 /Objects | |
| parent | 504f6e8653f7d8ccd81ee8376149a54e2a3f839d (diff) | |
| parent | 9743b2c2b584b0f0e56e33705e81b8b663dc03c3 (diff) | |
| download | cpython-4267869ad892520ef26dc403b988ef6b5b3fe428.zip cpython-4267869ad892520ef26dc403b988ef6b5b3fe428.tar.gz cpython-4267869ad892520ef26dc403b988ef6b5b3fe428.tar.bz2 | |
merge 3.3 (#20507)
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 994c4f5..42aa98d 100644 --- 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; } |