[Python-checkins] cpython (merge 3.2 -> default): (Merge 3.2) Issue #13913: normalize utf-8 codec name in UTF-8 decoder

[victor.stinner]

http://hg.python.org/cpython/rev/af1a9508f7fa
changeset:   74919:af1a9508f7fa
parent:      74917:76dfd1f08025
parent:      74918:c861c0a7f40c
user:        Victor Stinner <victor.stinner at haypocalc.com>
date:        Tue Feb 14 01:18:10 2012 +0100
summary:
  (Merge 3.2) Issue #13913: normalize utf-8 codec name in UTF-8 decoder

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


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4794,7 +4794,7 @@
       utf8Error:
         if (unicode_decode_call_errorhandler(
                 errors, &errorHandler,
-                "utf8", errmsg,
+                "utf-8", errmsg,
                 &starts, &e, &startinpos, &endinpos, &exc, &s,
                 &unicode, &i))
             goto onError;

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