[Python-checkins] cpython (merge 3.3 -> default): tkinter.Text.debug() now always returns 0/1.

[serhiy.storchaka]

http://hg.python.org/cpython/rev/e7d922d8ee03
changeset:   88411:e7d922d8ee03
parent:      88408:a5b9ae8b4547
parent:      88410:05e84d3ecd1e
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sat Jan 11 13:15:39 2014 +0200
summary:
  tkinter.Text.debug() now always returns 0/1.
Fixed a regression inroduced in issue #6157.

files:
  Lib/tkinter/__init__.py                    |  2 +-
  Lib/tkinter/test/test_tkinter/test_text.py |  5 ++---
  2 files changed, 3 insertions(+), 4 deletions(-)


diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -2963,7 +2963,7 @@
         """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
--- a/Lib/tkinter/test/test_tkinter/test_text.py
+++ b/Lib/tkinter/test/test_tkinter/test_text.py
@@ -16,13 +16,12 @@
 
     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)

-- 
Repository URL: http://hg.python.org/cpython