p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove pytest_namespace from _pytest/debugging.py

This commit is contained in:
Ronny Pfannschmidt 2017-02-28 13:40:38 +01:00
parent fab9b993f8
commit 794fd5658c
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
_pytest/debugging.py
View File

@ -16,8 +16,6 @@ def pytest_addoption(parser):
help="start a custom interactive Python debugger on errors. " help="start a custom interactive Python debugger on errors. "
"For example: --pdbcls=IPython.terminal.debugger:TerminalPdb") "For example: --pdbcls=IPython.terminal.debugger:TerminalPdb")
def pytest_namespace():
return {'set_trace': pytestPDB().set_trace}
def pytest_configure(config): def pytest_configure(config):
if config.getvalue("usepdb_cls"): if config.getvalue("usepdb_cls"):
@ -43,25 +41,27 @@ def pytest_configure(config):
pytestPDB._pdb_cls = pdb_cls pytestPDB._pdb_cls = pdb_cls
config._cleanup.append(fin) config._cleanup.append(fin)
class pytestPDB(object): class pytestPDB(object):
""" Pseudo PDB that defers to the real pdb. """ """ Pseudo PDB that defers to the real pdb. """
_pluginmanager = None _pluginmanager = None
_config = None _config = None
_pdb_cls = pdb.Pdb _pdb_cls = pdb.Pdb
def set_trace(self): @classmethod
def set_trace(cls):
""" invoke PDB set_trace debugging, dropping any IO capturing. """ """ invoke PDB set_trace debugging, dropping any IO capturing. """
import _pytest.config import _pytest.config
frame = sys._getframe().f_back frame = sys._getframe().f_back
if self._pluginmanager is not None: if cls._pluginmanager is not None:
capman = self._pluginmanager.getplugin("capturemanager") capman = cls._pluginmanager.getplugin("capturemanager")
if capman: if capman:
capman.suspendcapture(in_=True) capman.suspendcapture(in_=True)
tw = _pytest.config.create_terminal_writer(self._config) tw = _pytest.config.create_terminal_writer(cls._config)
tw.line() tw.line()
tw.sep(">", "PDB set_trace (IO-capturing turned off)") tw.sep(">", "PDB set_trace (IO-capturing turned off)")
self._pluginmanager.hook.pytest_enter_pdb(config=self._config) cls._pluginmanager.hook.pytest_enter_pdb(config=cls._config)
self._pdb_cls().set_trace(frame) cls._pdb_cls().set_trace(frame)
class PdbInvoke(object): class PdbInvoke(object):

6
pytest.py
View File

@ -11,6 +11,7 @@ __all__ = [
'__version__', '__version__',
'register_assert_rewrite', 'register_assert_rewrite',
'freeze_includes', 'freeze_includes',
'set_trace',
] ]
if __name__ == '__main__': # if run as a script or by 'python -m pytest' if __name__ == '__main__': # if run as a script or by 'python -m pytest'
@ -27,7 +28,10 @@ from _pytest.config import (
from _pytest.assertion import register_assert_rewrite from _pytest.assertion import register_assert_rewrite
from _pytest.freeze_support import freeze_includes from _pytest.freeze_support import freeze_includes
from _pytest import __version__ from _pytest import __version__
from _pytest.debugging import pytestPDB as __pytestPDB
set_trace = __pytestPDB.set_trace
_preloadplugins() # to populate pytest.* namespace so help(pytest) works _preloadplugins() # to populate pytest.* namespace so help(pytest) works