]> granicus.if.org Git - python/commitdiff
bpo-33096: Fix ttk.Treeview.insert. (GH-6228)
authorGarvit Khatri <garvitdelhi@gmail.com>
Mon, 26 Mar 2018 07:02:05 +0000 (12:32 +0530)
committerSerhiy Storchaka <storchaka@gmail.com>
Mon, 26 Mar 2018 07:02:05 +0000 (10:02 +0300)
Allow ttk.Treeview.insert to insert iid that has a false boolean value.
Note iid=0 and iid=False would be same.

Lib/tkinter/test/test_ttk/test_widgets.py
Lib/tkinter/ttk.py
Misc/NEWS.d/next/Library/2018-03-25-13-18-16.bpo-33096.ofdbe7.rst [new file with mode: 0644]

index bbc508d35810e8650b0b609036037f03a013dea2..5b0e29cdccaf4fe3fe1e7b6a7687fdc6f19b2d4d 100644 (file)
@@ -1662,6 +1662,15 @@ class TreeviewTest(AbstractWidgetTest, unittest.TestCase):
             self.tv.insert('', 'end', text=value), text=None),
             value)
 
+        # test for values which are not None
+        itemid = self.tv.insert('', 'end', 0)
+        self.assertEqual(itemid, '0')
+        itemid = self.tv.insert('', 'end', 0.0)
+        self.assertEqual(itemid, '0.0')
+        # this is because False resolves to 0 and element with 0 iid is already present
+        self.assertRaises(tkinter.TclError, self.tv.insert, '', 'end', False)
+        self.assertRaises(tkinter.TclError, self.tv.insert, '', 'end', '')
+
 
     def test_selection(self):
         self.assertRaises(TypeError, self.tv.selection, 'spam')
index 490b502a65f19a10c7bf14f7d34ab0b643e89036..573544dd84a390215d878953af91d8b011790ef4 100644 (file)
@@ -1361,7 +1361,7 @@ class Treeview(Widget, tkinter.XView, tkinter.YView):
         already exist in the tree. Otherwise, a new unique identifier
         is generated."""
         opts = _format_optdict(kw)
-        if iid:
+        if iid is not None:
             res = self.tk.call(self._w, "insert", parent, index,
                 "-id", iid, *opts)
         else:
diff --git a/Misc/NEWS.d/next/Library/2018-03-25-13-18-16.bpo-33096.ofdbe7.rst b/Misc/NEWS.d/next/Library/2018-03-25-13-18-16.bpo-33096.ofdbe7.rst
new file mode 100644 (file)
index 0000000..c55ea20
--- /dev/null
@@ -0,0 +1,4 @@
+Allow ttk.Treeview.insert to insert iid that has a false boolean value.
+Note iid=0 and iid=False would be same.
+Patch by Garvit Khatri.
+