[Python-checkins] cpython (merge 3.4 -> default): Merge: #11726: Make linecache docs reflect that all files are treated the same.

[r.david.murray]

https://hg.python.org/cpython/rev/1a5c72f9ff53
changeset:   95104:1a5c72f9ff53
parent:      95102:b8ceb071159f
parent:      95103:ceb14ecc1942
user:        R David Murray <rdmurray at bitdance.com>
date:        Fri Mar 20 11:32:17 2015 -0400
summary:
  Merge: #11726: Make linecache docs reflect that all files are treated the same.

files:
  Doc/library/linecache.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/linecache.rst b/Doc/library/linecache.rst
--- a/Doc/library/linecache.rst
+++ b/Doc/library/linecache.rst
@@ -14,9 +14,9 @@
 lines are read from a single file.  This is used by the :mod:`traceback` module
 to retrieve source lines for inclusion in  the formatted traceback.
 
-The :func:`tokenize.open` function is used to open Python source files. This
+The :func:`tokenize.open` function is used to open files. This
 function uses :func:`tokenize.detect_encoding` to get the encoding of the
-Python source file.
+file; in the absence of an encoding token, the file encoding defaults to UTF-8.
 
 The :mod:`linecache` module defines the following functions:
 

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