Merge 3.5

This commit is contained in:
Victor Stinner 2016-09-21 14:13:53 +02:00
commit 44f4874e68

View File

@ -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++;
}