[Python-checkins] cpython (2.7): backport #19426

[benjamin.peterson]

http://hg.python.org/cpython/rev/e0475c44832f
changeset:   86747:e0475c44832f
branch:      2.7
parent:      86666:9750acbf7c40
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Oct 29 15:27:14 2013 -0400
summary:
  backport #19426

files:
  Lib/idlelib/IOBinding.py |   2 +-
  Misc/NEWS                |  11 +++++++++++
  2 files changed, 12 insertions(+), 1 deletions(-)


diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/IOBinding.py
--- a/Lib/idlelib/IOBinding.py
+++ b/Lib/idlelib/IOBinding.py
@@ -125,7 +125,7 @@
     Raise LookupError if the encoding is declared but unknown.
     """
     # Only consider the first two lines
-    str = str.split("\n", 2)[:2]
+    lst = str.split("\n", 2)[:2]
     for line in lst:
         match = coding_re.match(line)
         if match is not None:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1,6 +1,17 @@
 Python News
 +++++++++++
 
+Whats' New in Python 2.7.6?
+===========================
+
+*Release date: 2013-11-02*
+
+IDLE
+----
+
+- Issue #19426: Fixed the opening of Python source file with specified encoding.
+
+
 What's New in Python 2.7.6 release candidate 1?
 ===============================================
 

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