Don't monkeypatch doctest during IPython startup.

This is no longer required since Python issue 8048 was fixed in 2.6.6, 2.7.1 and 3.2.

IPython/core/interactiveshell.py

@@ -64,7 +64,6 b' from IPython.utils import io'
 from IPython.utils import py3compat
 from IPython.utils import openpy
 from IPython.utils.decorators import undoc
-from IPython.utils.doctestreload import doctest_reload
 from IPython.utils.io import ask_yes_no
 from IPython.utils.ipstruct import Struct
 from IPython.utils.path import get_home_dir, get_ipython_dir, get_py_filename, unquote_filename
@@ -489,7 +488,6 b' class InteractiveShell(SingletonConfigurable):'
         self.init_display_pub()
         self.init_data_pub()
         self.init_displayhook()
-        self.init_reload_doctest()
         self.init_latextool()
         self.init_magics()
         self.init_logstart()
@@ -682,14 +680,6 b' class InteractiveShell(SingletonConfigurable):'
         # the appropriate time.
         self.display_trap = DisplayTrap(hook=self.displayhook)
 
-    def init_reload_doctest(self):
-        # Do a proper resetting of doctest, including the necessary displayhook
-        # monkeypatching
-        try:
-            doctest_reload()
-        except ImportError:
-            warn("doctest module does not exist.")
-
     def init_latextool(self):
         """Configure LaTeXTool."""
         cfg = LaTeXTool.instance(config=self.config)

IPython/utils/doctestreload.py

@@ -62,6 +62,11 b' def doctest_reload():'
 
     Notes
     -----
+    
+    As of Python 2.6.6, 2.7.1 and 3.2, this monkeypatching is no longer required.
+    doctest now takes care of resetting sys.displayhook itself. This function
+    remains for now in case anyone has to work with older versions, but it's
+    no longer called during IPython startup.
 
     This function *used to* reload doctest, but this has been disabled because
     reloading doctest unconditionally can cause massive breakage of other