From 0fef6e7813c9baa2c51d3f2eb8fa1352296c30b8 Mon Sep 17 00:00:00 2001
From: Matthew Brett <matthew.brett@gmail.com>
Date: Tue, 29 Dec 2009 16:54:26 +0000
Subject: FIX - allow doctest tester to parse config before being replaced by
 NumpyDocTest

---
 numpy/testing/nosetester.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'numpy/testing/nosetester.py')

diff --git a/numpy/testing/nosetester.py b/numpy/testing/nosetester.py
index 03dc71ca3..9f345ad26 100644
--- a/numpy/testing/nosetester.py
+++ b/numpy/testing/nosetester.py
@@ -240,18 +240,11 @@ class NoseTester(object):
 
         nose = import_nose()
 
-        # construct list of plugins, omitting the existing doctest plugin
+        # construct list of plugins
         import nose.plugins.builtin
         from noseclasses import NumpyDoctest, KnownFailure
         plugins = [NumpyDoctest(), KnownFailure()]
-        for p in nose.plugins.builtin.plugins:
-            plug = p()
-            if plug.name == 'doctest':
-                # skip the builtin doctest plugin
-                continue
-
-            plugins.append(plug)
-
+        plugins += [p() for p in nose.plugins.builtin.plugins]
         return argv, plugins
 
     def test(self, label='fast', verbose=1, extra_argv=None, doctests=False,
-- 
cgit v1.2.1