[Python-checkins] cpython (2.7): Issue #26386: Fixed ttk.TreeView selection operations with item id's
serhiy.storchaka
python-checkins at python.org
Tue Jun 14 05:46:44 EDT 2016
https://hg.python.org/cpython/rev/ac7c10f5e36e
changeset: 102021:ac7c10f5e36e
branch: 2.7
parent: 102018:cff695a0b449
user: Serhiy Storchaka <storchaka at gmail.com>
date: Tue Jun 14 12:46:14 2016 +0300
summary:
Issue #26386: Fixed ttk.TreeView selection operations with item id's
containing spaces.
files:
Lib/lib-tk/test/test_ttk/test_widgets.py | 60 +++++++++++-
Lib/lib-tk/ttk.py | 4 +-
Misc/NEWS | 3 +
3 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/Lib/lib-tk/test/test_ttk/test_widgets.py b/Lib/lib-tk/test/test_ttk/test_widgets.py
--- a/Lib/lib-tk/test/test_ttk/test_widgets.py
+++ b/Lib/lib-tk/test/test_ttk/test_widgets.py
@@ -2,7 +2,7 @@
import Tkinter as tkinter
from Tkinter import TclError
import ttk
-from test.test_support import requires, run_unittest
+from test.test_support import requires, run_unittest, have_unicode, u
import sys
from test_functions import MockTclObj
@@ -1486,6 +1486,60 @@
value)
+ def test_selection(self):
+ # item 'none' doesn't exist
+ self.assertRaises(tkinter.TclError, self.tv.selection_set, 'none')
+ self.assertRaises(tkinter.TclError, self.tv.selection_add, 'none')
+ self.assertRaises(tkinter.TclError, self.tv.selection_remove, 'none')
+ self.assertRaises(tkinter.TclError, self.tv.selection_toggle, 'none')
+
+ item1 = self.tv.insert('', 'end')
+ item2 = self.tv.insert('', 'end')
+ c1 = self.tv.insert(item1, 'end')
+ c2 = self.tv.insert(item1, 'end')
+ c3 = self.tv.insert(item1, 'end')
+ self.assertEqual(self.tv.selection(), ())
+
+ self.tv.selection_set((c1, item2))
+ self.assertEqual(self.tv.selection(), (c1, item2))
+ self.tv.selection_set(c2)
+ self.assertEqual(self.tv.selection(), (c2,))
+
+ self.tv.selection_add((c1, item2))
+ self.assertEqual(self.tv.selection(), (c1, c2, item2))
+ self.tv.selection_add(item1)
+ self.assertEqual(self.tv.selection(), (item1, c1, c2, item2))
+
+ self.tv.selection_remove((item1, c3))
+ self.assertEqual(self.tv.selection(), (c1, c2, item2))
+ self.tv.selection_remove(c2)
+ self.assertEqual(self.tv.selection(), (c1, item2))
+
+ self.tv.selection_toggle((c1, c3))
+ self.assertEqual(self.tv.selection(), (c3, item2))
+ self.tv.selection_toggle(item2)
+ self.assertEqual(self.tv.selection(), (c3,))
+
+ self.tv.insert('', 'end', id='with spaces')
+ self.tv.selection_set('with spaces')
+ self.assertEqual(self.tv.selection(), ('with spaces',))
+
+ self.tv.insert('', 'end', id='{brace')
+ self.tv.selection_set('{brace')
+ self.assertEqual(self.tv.selection(), ('{brace',))
+
+ if have_unicode:
+ self.tv.insert('', 'end', id=u(r'unicode\u20ac'))
+ self.tv.selection_set(u(r'unicode\u20ac'))
+ self.assertEqual(self.tv.selection(), (u(r'unicode\u20ac'),))
+
+ self.tv.insert('', 'end', id='bytes\xe2\x82\xac')
+ self.tv.selection_set('bytes\xe2\x82\xac')
+ self.assertEqual(self.tv.selection(),
+ (u(r'bytes\u20ac') if have_unicode else
+ 'bytes\xe2\x82\xac',))
+
+
def test_set(self):
self.tv['columns'] = ['A', 'B']
item = self.tv.insert('', 'end', values=['a', 'b'])
@@ -1612,5 +1666,9 @@
SizegripTest, TreeviewTest, WidgetTest,
)
+tests_gui = (
+ TreeviewTest,
+ )
+
if __name__ == "__main__":
run_unittest(*tests_gui)
diff --git a/Lib/lib-tk/ttk.py b/Lib/lib-tk/ttk.py
--- a/Lib/lib-tk/ttk.py
+++ b/Lib/lib-tk/ttk.py
@@ -1394,7 +1394,9 @@
def selection(self, selop=None, items=None):
"""If selop is not specified, returns selected items."""
- return self.tk.call(self._w, "selection", selop, items)
+ if isinstance(items, basestring):
+ items = (items,)
+ return self.tk.splitlist(self.tk.call(self._w, "selection", selop, items))
def selection_set(self, items):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,9 @@
Library
-------
+- Issue #26386: Fixed ttk.TreeView selection operations with item id's
+ containing spaces.
+
- Issue #25455: Fixed a crash in repr of cElementTree.Element with recursive tag.
Documentation
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list