From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 15 Aug 2013 19:07:58 +0000 (-0400)
Subject: Issue #18226: Fix ImportError and subsequent TypeError in 2.7 backport.
X-Git-Tag: v2.7.6rc1~238
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74b3290c104d6bb04c1ddb18299d67142678069a;p=thirdparty%2FPython%2Fcpython.git

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).
---

diff --git a/Lib/idlelib/idle_test/test_formatparagraph.py b/Lib/idlelib/idle_test/test_formatparagraph.py
index 2ec8232335bf..fca9540e92cb 100644
--- 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 TextWrapper:
 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.