[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

[terry.reedy]

http://hg.python.org/cpython/rev/4696f8d9bbea
changeset:   91641:4696f8d9bbea
parent:      91638:e873b7b6f5c6
parent:      91640:91546aa91cee
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri Jul 11 00:37:31 2014 -0400
summary:
  Merge with 3.4

files:
  Lib/idlelib/idle_test/test_searchdialogbase.py |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Lib/idlelib/idle_test/test_searchdialogbase.py b/Lib/idlelib/idle_test/test_searchdialogbase.py
--- a/Lib/idlelib/idle_test/test_searchdialogbase.py
+++ b/Lib/idlelib/idle_test/test_searchdialogbase.py
@@ -80,10 +80,10 @@
 
         self.assertIn(entry.get(), 'hello')
         egi = entry.grid_info()
-        equal(egi['row'], 0)
-        equal(egi['column'], 1)
-        equal(egi['rowspan'], 1)
-        equal(egi['columnspan'], 1)
+        equal(int(egi['row']), 0)
+        equal(int(egi['column']), 1)
+        equal(int(egi['rowspan']), 1)
+        equal(int(egi['columnspan']), 1)
         equal(self.dialog.row, 1)
 
     def test_create_entries(self):

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