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

[victor.stinner]

https://hg.python.org/cpython/rev/454f6eee1bd7
changeset:   104465:454f6eee1bd7
parent:      104463:439427ffbba1
parent:      104464:ac2f7cfff9a2
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Oct 12 13:59:13 2016 +0200
summary:
  Merge 3.6

files:
  Objects/unicodeobject.c |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -3096,9 +3096,9 @@
     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,

-- 
Repository URL: https://hg.python.org/cpython