From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 14 Feb 2012 00:18:10 +0000 (+0100)
Subject: (Merge 3.2) Issue #13913: normalize utf-8 codec name in UTF-8 decoder
X-Git-Tag: v3.3.0a1~190
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3a6b02d701935c4a321c1c40777b678dddaa5c3;p=python

(Merge 3.2) Issue #13913: normalize utf-8 codec name in UTF-8 decoder
---

c3a6b02d701935c4a321c1c40777b678dddaa5c3
diff --cc Objects/unicodeobject.c
index 67336bf9f1,70856f5455..07d3eb8569
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@@ -4792,14 -2760,13 +4792,14 @@@ decode_utf8_errors(const char *starts
          continue;
  
        utf8Error:
 -        outpos = p-PyUnicode_AS_UNICODE(unicode);
          if (unicode_decode_call_errorhandler(
                  errors, &errorHandler,
-                 "utf8", errmsg,
+                 "utf-8", errmsg,
                  &starts, &e, &startinpos, &endinpos, &exc, &s,
 -                &unicode, &outpos, &p))
 +                &unicode, &i))
              goto onError;
 +        /* Update data because unicode_decode_call_errorhandler might have
 +           re-created or resized the unicode object. */
          aligned_end = (const char *) ((size_t) e & ~LONG_PTR_MASK);
      }
      if (consumed)