[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#20507)

Sat Feb 15 19:03:31 CET 2014

http://hg.python.org/cpython/rev/b077ee45f14f
changeset: 89201:b077ee45f14f
parent: 89198:72f9b6222476
parent: 89199:b9947b68ab61
user: Benjamin Peterson <benjamin at python.org>
date: Sat Feb 15 13:03:20 2014 -0500
summary:
 merge 3.3 (#20507)
files:
 Objects/unicodeobject.c | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9666,7 +9666,7 @@
 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;
 }
-- 
Repository URL: http://hg.python.org/cpython
