1 files changed, 19 insertions, 25 deletions
diff --git a/Lib/idlelib/idle_test/mock_idle.py b/Lib/idlelib/idle_test/mock_idle.py
index 71fa480..7b09f83 100644
--- a/Lib/idlelib/idle_test/mock_idle.py
+++ b/Lib/idlelib/idle_test/mock_idle.py
@@ -5,44 +5,38 @@ Attributes and methods will be added as needed for tests.
 
 from idlelib.idle_test.mock_tk import Text
 
-class Func:
-    '''Record call, capture args, return/raise result set by test.
-
-    When mock function is called, set or use attributes:
-    self.called - increment call number even if no args, kwds passed.
-    self.args - capture positional arguments.
-    self.kwds - capture keyword arguments.
-    self.result - return or raise value set in __init__.
-    self.return_self - return self instead, to mock query class return.
-
-    Most common use will probably be to mock instance methods.
-    Given class instance, can set and delete as instance attribute.
+class Func(object):
+    '''Mock function captures args and returns result set by test.
+
+    Attributes:
+    self.called - records call even if no args, kwds passed.
+    self.result - set by init, returned by call.
+    self.args - captures positional arguments.
+    self.kwds - captures keyword arguments.
+
+    Most common use will probably be to mock methods.
     Mock_tk.Var and Mbox_func are special variants of this.
     '''
-    def __init__(self, result=None, return_self=False):
-        self.called = 0
+    def __init__(self, result=None):
+        self.called = False
         self.result = result
-        self.return_self = return_self
         self.args = None
         self.kwds = None
     def __call__(self, *args, **kwds):
-        self.called += 1
+        self.called = True
         self.args = args
         self.kwds = kwds
         if isinstance(self.result, BaseException):
             raise self.result
-        elif self.return_self:
-            return self
         else:
             return self.result
 
 
-class Editor:
-    '''Minimally imitate editor.EditorWindow class.
+class Editor(object):
+    '''Minimally imitate EditorWindow.EditorWindow class.
     '''
-    def __init__(self, flist=None, filename=None, key=None, root=None,
-                 text=None):  # Allow real Text with mock Editor.
-        self.text = text or Text()
+    def __init__(self, flist=None, filename=None, key=None, root=None):
+        self.text = Text()
         self.undo = UndoDelegator()
 
     def get_selection_indices(self):
@@ -51,8 +45,8 @@ class Editor:
         return first, last
 
 
-class UndoDelegator:
-    '''Minimally imitate undo.UndoDelegator class.
+class UndoDelegator(object):
+    '''Minimally imitate UndoDelegator,UndoDelegator class.
     '''
     # A real undo block is only needed for user interaction.
     def undo_block_start(*args):