summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-04-05 14:04:28 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-04-05 14:04:28 (GMT)
commit73d2da4209379fee0ea55a805c63e48644ca5ef8 (patch)
treef8b025c2be994ca267dc21e9c9dfc1c20384805a
parente7eee01f3697835d168f82357a6a97d7ca40d99a (diff)
parent1024541a0dbc1a007ba15ff7ae9a7154bf08a816 (diff)
downloadcpython-73d2da4209379fee0ea55a805c63e48644ca5ef8.zip
cpython-73d2da4209379fee0ea55a805c63e48644ca5ef8.tar.gz
cpython-73d2da4209379fee0ea55a805c63e48644ca5ef8.tar.bz2
Merge from 3.2
-rw-r--r--Lib/idlelib/tabbedpages.py4
-rw-r--r--Misc/NEWS3
2 files changed, 5 insertions, 2 deletions
diff --git a/Lib/idlelib/tabbedpages.py b/Lib/idlelib/tabbedpages.py
index f791702..2557732 100644
--- a/Lib/idlelib/tabbedpages.py
+++ b/Lib/idlelib/tabbedpages.py
@@ -78,7 +78,7 @@ class TabSet(Frame):
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 @@ class TabSet(Frame):
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
index 995900f..e2e0a2d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -19,6 +19,9 @@ Core and Builtins
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