changeset: 71232:2fbfb7ea362f
parent: 71229:42e23db3ddfc
parent: 71231:8b62f5d722f4
user: Victor Stinner <victor.stinner@haypocalc.com>
date: Tue Jul 05 14:31:28 2011 +0200
files: Lib/pydoc.py Misc/NEWS
description:
(merge 3.2) Issue #12451: pydoc: html_getfile() now uses tokenize.open() to
support Python scripts using a encoding different than UTF-8 (read the coding
cookie of the script).
diff -r 42e23db3ddfc -r 2fbfb7ea362f Lib/pydoc.py
--- a/Lib/pydoc.py	Tue Jul 05 14:04:39 2011 +0200
+++ b/Lib/pydoc.py	Tue Jul 05 14:31:28 2011 +0200
@@ -2311,7 +2311,7 @@
 def html_getfile(path):
 """Get and display a source file listing safely."""
 path = path.replace('%20', ' ')
- with open(path, 'r') as fp:
+ with tokenize.open(path) as fp:
 lines = html.escape(fp.read())
 body = '<pre>%s</pre>' % lines
 heading = html.heading(
diff -r 42e23db3ddfc -r 2fbfb7ea362f Misc/NEWS
--- a/Misc/NEWS	Tue Jul 05 14:04:39 2011 +0200
+++ b/Misc/NEWS	Tue Jul 05 14:31:28 2011 +0200
@@ -219,6 +219,10 @@
 Library
 -------
 
+- Issue #12451: pydoc: html_getfile() now uses tokenize.open() to support
+ Python scripts using a encoding different than UTF-8 (read the coding cookie
+ of the script).
+
 - Issue #12493: subprocess: Popen.communicate() now also handles EINTR errors
 if the process has only one pipe.
 
</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/2fbfb7ea362f">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/2fbfb7ea362f" 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>