[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

[zach.ware]

https://hg.python.org/cpython/rev/fc899dbe9da6
changeset:   96988:fc899dbe9da6
parent:      96985:96910e822266
parent:      96987:c74a438c5698
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Jul 21 22:50:54 2015 -0500
summary:
  Merge with 3.5

files:
  Doc/tools/rstlint.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/tools/rstlint.py b/Doc/tools/rstlint.py
--- a/Doc/tools/rstlint.py
+++ b/Doc/tools/rstlint.py
@@ -196,7 +196,7 @@
                 print('Checking %s...' % fn)
 
             try:
-                with open(fn, 'r') as f:
+                with open(fn, 'r', encoding='utf-8') as f:
                     lines = list(f)
             except (IOError, OSError) as err:
                 print('%s: cannot open: %s' % (fn, err))

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