##// END OF EJS Templates
Merge pull request #9374 from Carreau/cleanup...
Thomas Kluyver -
r22208:7975528c merge
parent child Browse files
Show More
@@ -25,8 +25,6 b' import logging'
25 import os
25 import os
26 import re
26 import re
27 import sys
27 import sys
28 import traceback
29 import unittest
30
28
31 from testpath import modified_env
29 from testpath import modified_env
32
30
@@ -41,10 +39,9 b' from doctest import (REPORTING_FLAGS, REPORT_ONLY_FIRST_FAILURE,'
41 linecache)
39 linecache)
42
40
43 # Third-party modules
41 # Third-party modules
44 import nose.core
45
42
46 from nose.plugins import doctests, Plugin
43 from nose.plugins import doctests, Plugin
47 from nose.util import anyp, getpackage, test_address, resolve_name, tolist
44 from nose.util import anyp, tolist
48
45
49 # Our own imports
46 # Our own imports
50 from IPython.utils.py3compat import builtin_mod, PY3, getcwd
47 from IPython.utils.py3compat import builtin_mod, PY3, getcwd
@@ -143,7 +140,7 b' class DocTestFinder(doctest.DocTestFinder):'
143 # doctests in extension modules.
140 # doctests in extension modules.
144
141
145 # Local shorthands
142 # Local shorthands
146 from inspect import isroutine, isclass, ismodule
143 from inspect import isroutine, isclass
147
144
148 # Look for tests in a module's contained objects.
145 # Look for tests in a module's contained objects.
149 if inspect.ismodule(obj) and self._recurse:
146 if inspect.ismodule(obj) and self._recurse:
General Comments 0
You need to be logged in to leave comments. Login now