summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-10-12 13:59:13 +0200
committerVictor Stinner <victor.stinner@gmail.com>2016-10-12 13:59:13 +0200
commit5a33759fbabb882a930d3346ccfa723bb7f602b9 (patch)
tree1b50fe7115fd04836d2d794fa1306177bf963d54
parent8a3748290a8f68166de330aef256f5eeaee9ddc3 (diff)
parentebe17e0347944b01a771eae4cee7f2a38cc82e42 (diff)
downloadcpython-git-5a33759fbabb882a930d3346ccfa723bb7f602b9.tar.gz
Merge 3.6
-rw-r--r--Objects/unicodeobject.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 2a83e40879..d4bce81b9d 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -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,