summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-01-11 11:13:46 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-01-11 11:13:46 (GMT)
commit2f26c224d7cbdb14f79cfd6f8d4914f60bb37bc5 (patch)
tree313ccdb8833050934f13bed80ad02cdec978141a
parent02d5db277743050488ad6298817b2956f22c63db (diff)
downloadcpython-2f26c224d7cbdb14f79cfd6f8d4914f60bb37bc5.zip
cpython-2f26c224d7cbdb14f79cfd6f8d4914f60bb37bc5.tar.gz
cpython-2f26c224d7cbdb14f79cfd6f8d4914f60bb37bc5.tar.bz2
tkinter.Text.debug() now always returns 0/1.
Fixed a regression inroduced in issue #6157.
-rw-r--r--Lib/tkinter/__init__.py2
-rw-r--r--Lib/tkinter/test/test_tkinter/test_text.py5
2 files changed, 3 insertions, 4 deletions
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index 2fdabde..2f4cce9 100644
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -3002,7 +3002,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/tkinter/test/test_tkinter/test_text.py b/Lib/tkinter/test/test_tkinter/test_text.py
index db8ae6c..4c3fa04 100644
--- a/Lib/tkinter/test/test_tkinter/test_text.py
+++ b/Lib/tkinter/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)