[pypy-commit] pypy py3.6: more places that give the name of the encoding as 'utf8'

[cfbolz]

Author: Carl Friedrich Bolz-Tereick <cfbolz at gmx.de>
Branch: py3.6
Changeset: r96179:2eeaa559be67
Date: 2019-02-26 21:15 +0100
http://bitbucket.org/pypy/pypy/changeset/2eeaa559be67/

Log:	more places that give the name of the encoding as 'utf8'

diff --git a/pypy/interpreter/unicodehelper.py b/pypy/interpreter/unicodehelper.py
--- a/pypy/interpreter/unicodehelper.py
+++ b/pypy/interpreter/unicodehelper.py
@@ -161,7 +161,7 @@
     try:
         return rutf8.check_utf8(string, True, start, end)
     except rutf8.CheckError as e:
-        decode_error_handler(space)('strict', 'utf8',
+        decode_error_handler(space)('strict', 'utf-8',
                                     'unexpected end of data', string,
                                     e.pos, e.pos + 1)
 
@@ -251,7 +251,7 @@
                     uchr = rutf8.codepoint_at_pos(s, pos)
                     if 0xDC00 <= uchr <= 0xDFFF:
                         delta += 1
-            res, newindex, rettype = errorhandler(errors, 'utf8',
+            res, newindex, rettype = errorhandler(errors, 'utf-8',
                         'surrogates not allowed', s, upos, upos + delta)
             if rettype == 'u':
                 for cp in rutf8.Utf8StringIterator(res):