floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move import to top

This commit is contained in:
Brian Maissy 2018-02-04 00:03:17 +02:00
parent 2a1b1107c5
commit 867344d0d7
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_pytest/debugging.py
View File

@ -2,6 +2,7 @@
from __future__ import absolute_import, division, print_function from __future__ import absolute_import, division, print_function
import pdb import pdb
import sys import sys
from doctest import UnexpectedException
def pytest_addoption(parser): def pytest_addoption(parser):
@ -95,16 +96,11 @@ def _enter_pdb(node, excinfo, rep):
def _postmortem_traceback(excinfo): def _postmortem_traceback(excinfo):
try:
from doctest import UnexpectedException
if isinstance(excinfo.value, UnexpectedException): if isinstance(excinfo.value, UnexpectedException):
# A doctest.UnexpectedException is not useful for post_mortem. # A doctest.UnexpectedException is not useful for post_mortem.
# Use the underlying exception instead: # Use the underlying exception instead:
return excinfo.value.exc_info[2] return excinfo.value.exc_info[2]
except ImportError: else:
# If we fail to import, continue quietly (if we ran out of file descriptors, for example: #1810)
pass
return excinfo._excinfo[2] return excinfo._excinfo[2]

2
changelog/1810.bugfix
View File

@ -1 +1 @@
If we fail to import doctest.UnexpectedException during postmortem, fail quietly and continue. Move import of doctest.UnexpectedException to top-level.