|
10 | 10 | from _pytest import doctest as pydoctest, outcomes
|
11 | 11 | from _pytest.doctest import DoctestModule, DoctestTextfile
|
12 | 12 | from _pytest.pathlib import import_path
|
13 |
| -from _pytest.outcomes import skip, OutcomeException |
14 | 13 |
|
15 | 14 | from scpdt.impl import DTChecker, DTParser, DebugDTRunner
|
16 | 15 | from scpdt.conftest import dt_config
|
17 |
| -from .util import np_errstate, matplotlib_make_nongui |
| 16 | +from scpdt.util import np_errstate, matplotlib_make_nongui |
18 | 17 | from scpdt.frontend import find_doctests
|
19 | 18 |
|
20 | 19 |
|
@@ -161,7 +160,7 @@ def collect(self):
|
161 | 160 | )
|
162 | 161 | except ImportError:
|
163 | 162 | if self.config.getvalue("doctest_ignore_import_errors"):
|
164 |
| - skip("unable to import module %r" % self.path) |
| 163 | + outcomes.skip("unable to import module %r" % self.path) |
165 | 164 | else:
|
166 | 165 | raise
|
167 | 166 |
|
@@ -272,7 +271,7 @@ def report_failure(self, out, test, example, got):
|
272 | 271 | raise failure
|
273 | 272 |
|
274 | 273 | def report_unexpected_exception(self, out, test, example, exc_info):
|
275 |
| - if isinstance(exc_info[1], OutcomeException): |
| 274 | + if isinstance(exc_info[1], outcomes.OutcomeException): |
276 | 275 | raise exc_info[1]
|
277 | 276 | if isinstance(exc_info[1], bdb.BdbQuit):
|
278 | 277 | outcomes.exit("Quitting debugger")
|
|
0 commit comments