[Python-checkins] cpython (2.7): Issue #18226: Fix ImportError and subsequent TypeError in 2.7 backport.

[terry.reedy]

http://hg.python.org/cpython/rev/47307e7c80e1
changeset:   85184:47307e7c80e1
branch:      2.7
parent:      85181:0e9d41edb2e4
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Thu Aug 15 15:07:58 2013 -0400
summary:
  Issue #18226: Fix ImportError and subsequent TypeError in 2.7 backport.
Running py27\PCbuild> python_d -m test.regrtest -ugui test_idle
ignores the exceptions and gives no indication of a problem (fixed in 3.3).

files:
  Lib/idlelib/idle_test/test_formatparagraph.py |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Lib/idlelib/idle_test/test_formatparagraph.py b/Lib/idlelib/idle_test/test_formatparagraph.py
--- a/Lib/idlelib/idle_test/test_formatparagraph.py
+++ b/Lib/idlelib/idle_test/test_formatparagraph.py
@@ -2,8 +2,8 @@
 import unittest
 from idlelib import FormatParagraph as fp
 from idlelib.EditorWindow import EditorWindow
-from tkinter import Tk, Text, TclError
-from test.support import requires
+from Tkinter import Tk, Text, TclError
+from test.test_support import requires
 
 
 class Is_Get_Test(unittest.TestCase):
@@ -238,7 +238,7 @@
 class Editor:
     def __init__(self, root):
         self.text = TextWrapper(root)
-    get_selection_indices = EditorWindow. get_selection_indices
+    get_selection_indices = EditorWindow. get_selection_indices.im_func
 
 class FormatEventTest(unittest.TestCase):
     """Test the formatting of text inside a Text widget.

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