summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2012-02-14 00:18:10 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2012-02-14 00:18:10 (GMT)
commitc3a6b02d701935c4a321c1c40777b678dddaa5c3 (patch)
tree18a83743c6477de6d7841102b087738b06c34e19 /Objects
parent3634bfbee6efa42d4e2a19c869da39051d4e2201 (diff)
parentcbe01342bc943cab3afec289ca679684fbd0ab9e (diff)
downloadcpython-c3a6b02d701935c4a321c1c40777b678dddaa5c3.zip
cpython-c3a6b02d701935c4a321c1c40777b678dddaa5c3.tar.gz
cpython-c3a6b02d701935c4a321c1c40777b678dddaa5c3.tar.bz2
(Merge 3.2) Issue #13913: normalize utf-8 codec name in UTF-8 decoder
Diffstat (limited to 'Objects')
-rw-r--r--Objects/unicodeobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 67336bf..07d3eb8 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4794,7 +4794,7 @@ decode_utf8_errors(const char *starts,
utf8Error:
if (unicode_decode_call_errorhandler(
errors, &errorHandler,
- "utf8", errmsg,
+ "utf-8", errmsg,
&starts, &e, &startinpos, &endinpos, &exc, &s,
&unicode, &i))
goto onError;