[Python-checkins] bpo-34936: Fix TclError in tkinter.Spinbox.selection_element(). (GH-9760)
Serhiy Storchaka
webhook-mailer at python.org
Thu Oct 18 15:28:38 EDT 2018
https://github.com/python/cpython/commit/1deea5e53991b46351f6bb395b22365c9455ed88
commit: 1deea5e53991b46351f6bb395b22365c9455ed88
branch: master
author: Juliette Monsel <j4321 at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2018-10-18T22:28:31+03:00
summary:
bpo-34936: Fix TclError in tkinter.Spinbox.selection_element(). (GH-9760)
files:
A Misc/NEWS.d/next/Library/2018-10-08-21-05-11.bpo-34936.3tRqdq.rst
M Lib/tkinter/__init__.py
M Lib/tkinter/test/test_tkinter/test_widgets.py
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index 1dc411884511..ae493ed3aaaf 100644
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -4280,7 +4280,7 @@ def selection_adjust(self, index):
select to commands. If the selection isn't currently in
the spinbox, then a new selection is created to include
the characters between index and the most recent selection
- anchor point, inclusive. Returns an empty string.
+ anchor point, inclusive.
"""
return self.selection("adjust", index)
@@ -4288,7 +4288,7 @@ def selection_clear(self):
"""Clear the selection
If the selection isn't in this widget then the
- command has no effect. Returns an empty string.
+ command has no effect.
"""
return self.selection("clear")
@@ -4296,9 +4296,9 @@ def selection_element(self, element=None):
"""Sets or gets the currently selected element.
If a spinbutton element is specified, it will be
- displayed depressed
+ displayed depressed.
"""
- return self.selection("element", element)
+ return self.tk.call(self._w, 'selection', 'element', element)
def selection_from(self, index):
"""Set the fixed end of a selection to INDEX."""
diff --git a/Lib/tkinter/test/test_tkinter/test_widgets.py b/Lib/tkinter/test/test_tkinter/test_widgets.py
index 12a0fbeeeee1..16e9d93944c2 100644
--- a/Lib/tkinter/test/test_tkinter/test_widgets.py
+++ b/Lib/tkinter/test/test_tkinter/test_widgets.py
@@ -522,7 +522,14 @@ def test_selection_methods(self):
self.assertEqual(widget.selection_get(), '2345')
widget.selection_adjust(0)
self.assertEqual(widget.selection_get(), '12345')
- widget.selection_adjust(0)
+
+ def test_selection_element(self):
+ widget = self.create()
+ self.assertEqual(widget.selection_element(), "none")
+ widget.selection_element("buttonup")
+ self.assertEqual(widget.selection_element(), "buttonup")
+ widget.selection_element("buttondown")
+ self.assertEqual(widget.selection_element(), "buttondown")
@add_standard_options(StandardOptionsTests)
diff --git a/Misc/NEWS.d/next/Library/2018-10-08-21-05-11.bpo-34936.3tRqdq.rst b/Misc/NEWS.d/next/Library/2018-10-08-21-05-11.bpo-34936.3tRqdq.rst
new file mode 100644
index 000000000000..7c1f7bb59760
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-10-08-21-05-11.bpo-34936.3tRqdq.rst
@@ -0,0 +1,2 @@
+Fix ``TclError`` in ``tkinter.Spinbox.selection_element()``. Patch by
+Juliette Monsel.
More information about the Python-checkins
mailing list