summaryrefslogtreecommitdiffstats
path: root/Lib/tkinter
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-11-03 12:29:35 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-11-03 12:29:35 (GMT)
commit0b9e815d8dfab1844d8095b916e0ccb75d7bf3da (patch)
treece917c73ca7e17974eb5ccf0a92f10b3dc75039d /Lib/tkinter
parent2849e0dfb7ed722eec601ffd9b18523019e151b2 (diff)
downloadcpython-0b9e815d8dfab1844d8095b916e0ccb75d7bf3da.zip
cpython-0b9e815d8dfab1844d8095b916e0ccb75d7bf3da.tar.gz
cpython-0b9e815d8dfab1844d8095b916e0ccb75d7bf3da.tar.bz2
Issue #6157: Fixed tkinter.Text.debug(). Original patch by Guilherme Polo.
Diffstat (limited to 'Lib/tkinter')
-rw-r--r--Lib/tkinter/__init__.py5
-rw-r--r--Lib/tkinter/test/test_tkinter/test_text.py11
-rw-r--r--Lib/tkinter/test/test_tkinter/test_widgets.py13
3 files changed, 27 insertions, 2 deletions
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index 549dfaa..9cb2284 100644
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -2990,8 +2990,9 @@ class Text(Widget, XView, YView):
def debug(self, boolean=None):
"""Turn on the internal consistency checks of the B-Tree inside the text
widget according to BOOLEAN."""
- return self.tk.getboolean(self.tk.call(
- self._w, 'debug', boolean))
+ if boolean is None:
+ return 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)."""
self.tk.call(self._w, 'delete', index1, index2)
diff --git a/Lib/tkinter/test/test_tkinter/test_text.py b/Lib/tkinter/test/test_tkinter/test_text.py
index a93c4ce..4c3fa04 100644
--- a/Lib/tkinter/test/test_tkinter/test_text.py
+++ b/Lib/tkinter/test/test_tkinter/test_text.py
@@ -14,6 +14,17 @@ class TextTest(unittest.TestCase):
def tearDown(self):
self.text.destroy()
+ def test_debug(self):
+ text = self.text
+ olddebug = text.debug()
+ try:
+ text.debug(0)
+ self.assertEqual(text.debug(), 0)
+ text.debug(1)
+ self.assertEqual(text.debug(), 1)
+ finally:
+ text.debug(olddebug)
+ self.assertEqual(text.debug(), olddebug)
def test_search(self):
text = self.text
diff --git a/Lib/tkinter/test/test_tkinter/test_widgets.py b/Lib/tkinter/test/test_tkinter/test_widgets.py
index 7b89c74..1ed306a 100644
--- a/Lib/tkinter/test/test_tkinter/test_widgets.py
+++ b/Lib/tkinter/test/test_tkinter/test_widgets.py
@@ -610,6 +610,19 @@ class TextTest(AbstractWidgetTest, unittest.TestCase):
else:
self.checkEnumParam(widget, 'wrap', 'char', 'none', 'word')
+ def test_bbox(self):
+ widget = self.create()
+ bbox = widget.bbox('1.1')
+ self.assertEqual(len(bbox), 4)
+ for item in bbox:
+ self.assertIsInstance(item, int)
+
+ self.assertIsNone(widget.bbox('end'))
+ self.assertRaises(tkinter.TclError, widget.bbox, 'noindex')
+ self.assertRaises(tkinter.TclError, widget.bbox, None)
+ self.assertRaises(tkinter.TclError, widget.bbox)
+ self.assertRaises(tkinter.TclError, widget.bbox, '1.1', 'end')
+
@add_standard_options(PixelSizeTests, StandardOptionsTests)
class CanvasTest(AbstractWidgetTest, unittest.TestCase):