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 --git a/Lib/pydoc.py b/Lib/pydoc.py
index 2533226025ec6a391512ad78d894a89e032a647c..aa4b6d5c4fa9e670c06f30e7bf0d4f776d38511d 100755 (executable)
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -2580,7 +2580,7 @@ def _url_handler(url, content_type="text/html"):
     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
index ae0ed58226e23ad889128ced06c4d9010d39d7e7..0bc7cd76e045ad56de815a87f7141a681720ae44 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,10 @@ Library
 - 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.