summaryrefslogtreecommitdiff
path: root/Objects/unicodeobject.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-10-11 23:01:12 -0700
committerBenjamin Peterson <benjamin@python.org>2016-10-11 23:01:12 -0700
commit8a3748290a8f68166de330aef256f5eeaee9ddc3 (patch)
tree51c0581cf205bfc2a654417a128d184d047aa996 /Objects/unicodeobject.c
parent22e25cb1db6fcca0816915881fbba2bd3553a16d (diff)
parentb329e1bb5bd2a59cf22550dc19c8744491d51801 (diff)
downloadcpython-git-8a3748290a8f68166de330aef256f5eeaee9ddc3.tar.gz
merge 3.6 (#28417)
Diffstat (limited to 'Objects/unicodeobject.c')
-rw-r--r--Objects/unicodeobject.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 8f34e01232..2a83e40879 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -2891,7 +2891,6 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
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",