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

Mon May 16 15:40:57 EDT 2016

https://hg.python.org/cpython/rev/c08fa004a2d4
changeset: 101385:c08fa004a2d4
parent: 101384:fc7b366c4c8a
parent: 101382:774367d21bf3
user: Yury Selivanov <yselivanov at sprymix.com>
date: Mon May 16 15:40:38 2016 -0400
summary:
 Merge heads
files:
 Doc/whatsnew/3.6.rst | 4 ++++
 Lib/tkinter/__init__.py | 12 ------------
 Misc/NEWS | 3 +++
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -489,6 +489,10 @@
 :mod:`traceback` module. They were undocumented methods deprecated since
 Python 3.2 and equivalent functionality is available from private methods.
 
+* The ``tk_menuBar()`` and ``tk_bindForTraversal()`` dummy methods in
+ :mod:`tkinter` widget classes were removed (corresponding Tk commands
+ were obsolete since Tk 4.0).
+
 
 Porting to Python 3.6
 =====================
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -468,12 +468,6 @@
 disabledForeground, insertBackground, troughColor."""
 self.tk.call(('tk_setPalette',)
 + _flatten(args) + _flatten(list(kw.items())))
- def tk_menuBar(self, *args):
- """Do not use. Needed in Tk 3.6 and earlier."""
- # obsolete since Tk 4.0
- import warnings
- warnings.warn('tk_menuBar() does nothing and will be removed in 3.6',
- DeprecationWarning, stacklevel=2)
 def wait_variable(self, name='PY_VAR'):
 """Wait until the variable is modified.
 
@@ -2705,12 +2699,6 @@
 def tk_popup(self, x, y, entry=""):
 """Post the menu at position X,Y with entry ENTRY."""
 self.tk.call('tk_popup', self._w, x, y, entry)
- def tk_bindForTraversal(self):
- # obsolete since Tk 4.0
- import warnings
- warnings.warn('tk_bindForTraversal() does nothing and '
- 'will be removed in 3.6',
- DeprecationWarning, stacklevel=2)
 def activate(self, index):
 """Activate entry at INDEX."""
 self.tk.call(self._w, 'activate', index)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -280,6 +280,9 @@
 Library
 -------
 
+- Issue #27031: Removed dummy methods in Tkinter widget classes: tk_menuBar()
+ and tk_bindForTraversal().
+
 - Issue #14132: Fix urllib.request redirect handling when the target only has
 a query string. Original fix by Ján Janech.
 
-- 
Repository URL: https://hg.python.org/cpython
