tkinter.Text.debug() now always returns 0/1.

Fixed regression inroduced in issue #6157.

diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index 0da6cfc6a07ad2dfcad3ff8eb6e6d6c221245d24..18b5c9674f79bc925df159978259784c77572fb6 100644 (file)
--- a/Lib/lib-tk/Tkinter.py
+++ b/Lib/lib-tk/Tkinter.py
@@ -2921,7 +2921,7 @@ class Text(Widget, XView, YView):
         """Turn on the internal consistency checks of the B-Tree inside the text
         widget according to BOOLEAN."""
         if boolean is None:
-            return self.tk.call(self._w, 'debug')
+            return self.tk.getboolean(self.tk.call(self._w, 'debug'))
         self.tk.call(self._w, 'debug', boolean)
     def delete(self, index1, index2=None):
         """Delete the characters between INDEX1 and INDEX2 (not included)."""

diff --git a/Lib/lib-tk/test/test_tkinter/test_text.py b/Lib/lib-tk/test/test_tkinter/test_text.py
index 5a6a6f219575613ace72b4edfdbaf67d486a0e46..ca21b601e2c9730e026d8e7ccc21abb2ebe31407 100644 (file)
--- a/Lib/lib-tk/test/test_tkinter/test_text.py
+++ b/Lib/lib-tk/test/test_tkinter/test_text.py
@@ -16,13 +16,12 @@ class TextTest(unittest.TestCase):
 
     def test_debug(self):
         text = self.text
-        wantobjects = self.root.wantobjects()
         olddebug = text.debug()
         try:
             text.debug(0)
-            self.assertEqual(text.debug(), 0 if wantobjects else '0')
+            self.assertEqual(text.debug(), 0)
             text.debug(1)
-            self.assertEqual(text.debug(), 1 if wantobjects else '1')
+            self.assertEqual(text.debug(), 1)
         finally:
             text.debug(olddebug)
             self.assertEqual(text.debug(), olddebug)