[Python-checkins] cpython (3.2): Issue #12451: pydoc: html_getfile() now uses tokenize.open() to support Python

[victor.stinner]

http://hg.python.org/cpython/rev/8b62f5d722f4
changeset:   71231:8b62f5d722f4
branch:      3.2
parent:      71228:dcfacc2d93b4
user:        Victor Stinner <victor.stinner at haypocalc.com>
date:        Tue Jul 05 14:30:41 2011 +0200
summary:
  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).

files:
  Lib/pydoc.py |  2 +-
  Misc/NEWS    |  4 ++++
  2 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/pydoc.py b/Lib/pydoc.py
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -2580,7 +2580,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 --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,10 @@
 - Issue #12467: warnings: fix a race condition if a warning is emitted at
   shutdown, if globals()['__file__'] is None.
 
+- 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 #12451: pydoc: importfile() now opens the Python script in binary mode,
   instead of text mode using the locale encoding, to avoid encoding issues.
 

-- 
Repository URL: http://hg.python.org/cpython