[Python-checkins] cpython (merge 3.6 -> default): merge 3.6 (#28417)

Wed Oct 12 02:01:20 EDT 2016

https://hg.python.org/cpython/rev/439427ffbba1
changeset: 104463:439427ffbba1
parent: 104461:b96e6efcec0e
parent: 104462:6a6ac890db78
user: Benjamin Peterson <benjamin at python.org>
date: Tue Oct 11 23:01:12 2016 -0700
summary:
 merge 3.6 (#28417)
files:
 Objects/unicodeobject.c | 1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -2891,7 +2891,6 @@
 do
 {
 if ((unsigned char)*p > 127) {
- va_end(vargs2);
 PyErr_Format(PyExc_ValueError,
 "PyUnicode_FromFormatV() expects an ASCII-encoded format "
 "string, got a non-ASCII byte: 0x%02x",
-- 
Repository URL: https://hg.python.org/cpython
