changeset: 74919:af1a9508f7fa
parent: 74917:76dfd1f08025
parent: 74918:c861c0a7f40c
user: Victor Stinner <victor.stinner@haypocalc.com>
date: Tue Feb 14 01:18:10 2012 +0100
files: Objects/unicodeobject.c
description:
(Merge 3.2) Issue #13913: normalize utf-8 codec name in UTF-8 decoder
diff -r 76dfd1f08025 -r af1a9508f7fa Objects/unicodeobject.c
--- a/Objects/unicodeobject.c	Mon Feb 13 23:31:26 2012 +0100
+++ b/Objects/unicodeobject.c	Tue Feb 14 01:18:10 2012 +0100
@@ -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;
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/af1a9508f7fa">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/af1a9508f7fa" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>