From 7a0258232967bee46ace263e69d33a0e40dd3078 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Fri, 7 Nov 2014 12:02:11 +0200 Subject: [PATCH] Issue #22769: Fixed ttk.Treeview.tag_has() when called without arguments. --- Lib/lib-tk/test/test_ttk/test_widgets.py | 16 ++++++++++++++++ Lib/lib-tk/ttk.py | 6 +++++- Misc/NEWS | 2 ++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Lib/lib-tk/test/test_ttk/test_widgets.py b/Lib/lib-tk/test/test_ttk/test_widgets.py index 3138ae6c0e..6848905134 100644 --- a/Lib/lib-tk/test/test_ttk/test_widgets.py +++ b/Lib/lib-tk/test/test_ttk/test_widgets.py @@ -1,5 +1,6 @@ import unittest import Tkinter as tkinter +from Tkinter import TclError import ttk from test.test_support import requires, run_unittest import sys @@ -1564,6 +1565,21 @@ class TreeviewTest(AbstractWidgetTest, unittest.TestCase): 'blue') self.assertIsInstance(self.tv.tag_configure('test'), dict) + def test_tag_has(self): + item1 = self.tv.insert('', 'end', text='Item 1', tags=['tag1']) + item2 = self.tv.insert('', 'end', text='Item 2', tags=['tag2']) + self.assertRaises(TypeError, self.tv.tag_has) + self.assertRaises(TclError, self.tv.tag_has, 'tag1', 'non-existing') + self.assertTrue(self.tv.tag_has('tag1', item1)) + self.assertFalse(self.tv.tag_has('tag1', item2)) + self.assertFalse(self.tv.tag_has('tag2', item1)) + self.assertTrue(self.tv.tag_has('tag2', item2)) + self.assertFalse(self.tv.tag_has('tag3', item1)) + self.assertFalse(self.tv.tag_has('tag3', item2)) + self.assertEqual(self.tv.tag_has('tag1'), (item1,)) + self.assertEqual(self.tv.tag_has('tag2'), (item2,)) + self.assertEqual(self.tv.tag_has('tag3'), ()) + @add_standard_options(StandardTtkOptionsTests) class SeparatorTest(AbstractWidgetTest, unittest.TestCase): diff --git a/Lib/lib-tk/ttk.py b/Lib/lib-tk/ttk.py index 5ed018a6a9..58f769895d 100644 --- a/Lib/lib-tk/ttk.py +++ b/Lib/lib-tk/ttk.py @@ -1458,7 +1458,11 @@ class Treeview(Widget, Tkinter.XView, Tkinter.YView): all items which have the specified tag. * Availability: Tk 8.6""" - return self.tk.getboolean( + if item is None: + return self.tk.splitlist( + self.tk.call(self._w, "tag", "has", tagname)) + else: + return self.tk.getboolean( self.tk.call(self._w, "tag", "has", tagname, item)) diff --git a/Misc/NEWS b/Misc/NEWS index e49239c017..5900ff1ab2 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -37,6 +37,8 @@ Core and Builtins Library ------- +- Issue #22769: Fixed ttk.Treeview.tag_has() when called without arguments. + - Issue #22787: Allow the keyfile argument of SSLContext.load_cert_chain to be None. -- 2.50.1