(merge 3.2) Issue #12451: pydoc.synopsis() now reads the encoding cookie if

available, to read the Python script from the right encoding.

1 files changed, 5 insertions, 4 deletions

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 89d00a3..a39962e 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -51,16 +51,17 @@ Richard Chamberlain, for the first implementation of textdoc.
 #     the current directory is changed with os.chdir(), an incorrect
 #     path will be displayed.
 
-import os
-import sys
 import builtins
 import imp
-import io
 import inspect
+import io
+import os
 import pkgutil
 import platform
 import re
+import sys
 import time
+import tokenize
 import warnings
 from collections import deque
 from reprlib import Repr
@@ -221,7 +222,7 @@ def synopsis(filename, cache={}):
     if lastupdate < mtime:
         info = inspect.getmoduleinfo(filename)
         try:
-            file = open(filename)
+            file = tokenize.open(filename)
         except IOError:
             # module can't be opened, so skip it
             return None