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

Thu Apr 5 16:27:30 CEST 2012

http://hg.python.org/cpython/rev/c5caaa83ca60
changeset: 76125:c5caaa83ca60
parent: 76124:0375d3fa499c
parent: 76119:4be55684eefc
user: Stefan Krah <skrah at bytereef.org>
date: Thu Apr 05 16:25:21 2012 +0200
summary:
 Merge.
files:
 Lib/idlelib/tabbedpages.py | 4 ++--
 Misc/NEWS | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Lib/idlelib/tabbedpages.py b/Lib/idlelib/tabbedpages.py
--- a/Lib/idlelib/tabbedpages.py
+++ b/Lib/idlelib/tabbedpages.py
@@ -78,7 +78,7 @@
 def remove_tab(self, tab_name):
 """Remove the tab named <tab_name>"""
 if not tab_name in self._tab_names:
- raise KeyError("No such Tab: '%s" % page_name)
+ raise KeyError("No such Tab: '%s" % tab_name)
 
 self._tab_names.remove(tab_name)
 self._arrange_tabs()
@@ -88,7 +88,7 @@
 if tab_name == self._selected_tab:
 return
 if tab_name is not None and tab_name not in self._tabs:
- raise KeyError("No such Tab: '%s" % page_name)
+ raise KeyError("No such Tab: '%s" % tab_name)
 
 # deselect the current selected tab
 if self._selected_tab is not None:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -19,6 +19,9 @@
 Library
 -------
 
+- Issue #14496: Fix wrong name in idlelib/tabbedpages.py.
+ Patch by Popa Claudiu.
+
 - Issue #3033: Add displayof parameter to tkinter font. Patch by Guilherme Polo.
 
 - Issue #14482: Raise a ValueError, not a NameError, when trying to create
-- 
Repository URL: http://hg.python.org/cpython
