remove pytest_namespace from _pytest/runner.py
This commit is contained in:
parent
c74103f395
commit
6a02cdbb35
|
@ -10,13 +10,6 @@ import pytest
|
|||
from _pytest._code.code import TerminalRepr, ExceptionInfo
|
||||
|
||||
|
||||
def pytest_namespace():
|
||||
return {
|
||||
'fail' : fail,
|
||||
'skip' : skip,
|
||||
'importorskip' : importorskip,
|
||||
'exit' : exit,
|
||||
}
|
||||
|
||||
#
|
||||
# pytest plugin hooks
|
||||
|
|
10
pytest.py
10
pytest.py
|
@ -15,7 +15,12 @@ __all__ = [
|
|||
'warns',
|
||||
'deprecated_call',
|
||||
'fixture',
|
||||
'yield_fixture'
|
||||
'yield_fixture',
|
||||
'fail',
|
||||
'skip',
|
||||
'importorskip',
|
||||
'exit',
|
||||
|
||||
]
|
||||
|
||||
if __name__ == '__main__': # if run as a script or by 'python -m pytest'
|
||||
|
@ -35,8 +40,7 @@ from _pytest.freeze_support import freeze_includes
|
|||
from _pytest import __version__
|
||||
from _pytest.debugging import pytestPDB as __pytestPDB
|
||||
from _pytest.recwarn import warns, deprecated_call
|
||||
|
||||
|
||||
from _pytest.runner import fail, skip, importorskip, exit
|
||||
set_trace = __pytestPDB.set_trace
|
||||
|
||||
_preloadplugins() # to populate pytest.* namespace so help(pytest) works
|
||||
|
|
Loading…
Reference in New Issue