diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2016-09-21 12:13:53 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2016-09-21 12:13:53 (GMT) |
| commit | 44f4874e68a04235276d63755dd1fb7627d3220c (patch) | |
| tree | f504729187a24aa3efc89b9a400c39c4e2099d89 /Objects | |
| parent | 2f2fee19ec63a09b184fbe09135ecb2f16a0e257 (diff) | |
| parent | 1ddf53d496a3b7bd09fe8672daa2f07a4d240f2c (diff) | |
| download | cpython-44f4874e68a04235276d63755dd1fb7627d3220c.zip cpython-44f4874e68a04235276d63755dd1fb7627d3220c.tar.gz cpython-44f4874e68a04235276d63755dd1fb7627d3220c.tar.bz2 | |
Merge 3.5
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 7984454..298cd23 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -2896,7 +2896,7 @@ PyUnicode_FromFormatV(const char *format, va_list vargs) "PyUnicode_FromFormatV() expects an ASCII-encoded format " "string, got a non-ASCII byte: 0x%02x", (unsigned char)*p); - return NULL; + goto fail; } p++; } |