Merge 3.6

This commit is contained in:
Victor Stinner 2016-10-12 13:59:13 +02:00
commit 5a33759fba

View file

@ -3096,9 +3096,9 @@ PyUnicode_FromEncodedObject(PyObject *obj,
return v;
}
/* Normalize an encoding name: C implementation of
encodings.normalize_encoding(). Return 1 on success, or 0 on error (encoding
is longer than lower_len-1). */
/* Normalize an encoding name: similar to encodings.normalize_encoding(), but
also convert to lowercase. Return 1 on success, or 0 on error (encoding is
longer than lower_len-1). */
int
_Py_normalize_encoding(const char *encoding,
char *lower,