From 4b9811e222da42d7157d891830581fe52b7ef1d1 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Fri, 3 Apr 2015 15:47:44 -0700
Subject: [PATCH 1/2] Disable ipdoctest outside core

Ultimately, we can get rid of ipdoctest,
but we still have several doctests in core.
---
 IPython/testing/iptest.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index b064d80dd..e90eafc0d 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -463,10 +463,6 @@ def run_iptest():
         
 
     argv = sys.argv + [ '--detailed-errors',  # extra info in tracebacks
-
-                        '--with-ipdoctest',
-                        '--ipdoctest-tests','--ipdoctest-extension=txt',
-
                         # We add --exe because of setuptools' imbecility (it
                         # blindly does chmod +x on ALL files).  Nose does the
                         # right thing and it tries to avoid executables,
@@ -489,11 +485,19 @@ def run_iptest():
         # for nose >= 0.11, though unfortunately nose 0.10 doesn't support it.
         argv.append('--traverse-namespace')
 
-    # use our plugin for doctesting.  It will remove the standard doctest plugin
-    # if it finds it enabled
-    plugins = [ExclusionPlugin(section.excludes), IPythonDoctest(), KnownFailure(),
+    plugins = [ ExclusionPlugin(section.excludes), KnownFailure(),
                SubprocessStreamCapturePlugin() ]
     
+    # we still have some vestigial doctests in core
+    if (section.name.startswith(('core', 'IPython.core'))):
+        plugins.append(IPythonDoctest())
+        argv.extend([
+            '--with-ipdoctest',
+            '--ipdoctest-tests',
+            '--ipdoctest-extension=txt',
+        ])
+
+    
     # Use working directory set by parent process (see iptestcontroller)
     if 'IPTEST_WORKING_DIR' in os.environ:
         os.chdir(os.environ['IPTEST_WORKING_DIR'])

From 74348798af32b8973a99191c33d10aa2c67d16de Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Fri, 3 Apr 2015 15:57:01 -0700
Subject: [PATCH 2/2] remove now-obsolete use of skip_doctest outside core

---
 IPython/html/widgets/widget_link.py   | 3 ---
 IPython/html/widgets/widget_output.py | 2 --
 2 files changed, 5 deletions(-)

diff --git a/IPython/html/widgets/widget_link.py b/IPython/html/widgets/widget_link.py
index 8fcaa242f..8f5df89cd 100644
--- a/IPython/html/widgets/widget_link.py
+++ b/IPython/html/widgets/widget_link.py
@@ -7,7 +7,6 @@ Propagate changes between widgets on the javascript side
 # Distributed under the terms of the Modified BSD License.
 
 from .widget import Widget
-from IPython.testing.skipdoctest import skip_doctest
 from IPython.utils.traitlets import Unicode, Tuple, List,Instance, TraitError
 
 class WidgetTraitTuple(Tuple):
@@ -51,7 +50,6 @@ class Link(Widget):
         self.close()
 
 
-@skip_doctest
 def jslink(*args):
     """Link traits from different widgets together on the frontend so they remain in sync.
 
@@ -92,7 +90,6 @@ class DirectionalLink(Widget):
     def unlink(self):
         self.close()
 
-@skip_doctest
 def jsdlink(source, *targets):
     """Link the trait of a source widget with traits of target widgets in the frontend.
 
diff --git a/IPython/html/widgets/widget_output.py b/IPython/html/widgets/widget_output.py
index 771ecb761..e78648132 100644
--- a/IPython/html/widgets/widget_output.py
+++ b/IPython/html/widgets/widget_output.py
@@ -10,10 +10,8 @@ from .widget import DOMWidget
 import sys
 from IPython.utils.traitlets import Unicode, List
 from IPython.display import clear_output
-from IPython.testing.skipdoctest import skip_doctest
 from IPython.kernel.zmq.session import Message
 
-@skip_doctest
 class Output(DOMWidget):
     """Widget used as a context manager to display output.