[Python-checkins] cpython (merge 3.5 -> 3.6): Merge 3.5
victor.stinner
python-checkins at python.org
Wed Sep 21 08:19:48 EDT 2016
https://hg.python.org/cpython/rev/50cbc3100475
changeset: 103985:50cbc3100475
branch: 3.6
parent: 103982:c99600106976
parent: 103984:00f090563f1b
user: Victor Stinner <victor.stinner at gmail.com>
date: Wed Sep 21 14:13:53 2016 +0200
summary:
Merge 3.5
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
@@ -2896,7 +2896,7 @@
"PyUnicode_FromFormatV() expects an ASCII-encoded format "
"string, got a non-ASCII byte: 0x%02x",
(unsigned char)*p);
- return NULL;
+ goto fail;
}
p++;
}
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list