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

remove pytest_namespace from _pytest/runner.py

This commit is contained in:
Ronny Pfannschmidt 2017-02-28 14:09:39 +01:00
parent c74103f395
commit 6a02cdbb35
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
_pytest/runner.py
View File

@ -10,13 +10,6 @@ import pytest
from _pytest._code.code import TerminalRepr, ExceptionInfo from _pytest._code.code import TerminalRepr, ExceptionInfo
def pytest_namespace():
return {
'fail' : fail,
'skip' : skip,
'importorskip' : importorskip,
'exit' : exit,
}
# #
# pytest plugin hooks # pytest plugin hooks

10
pytest.py
View File

@ -15,7 +15,12 @@ __all__ = [
'warns', 'warns',
'deprecated_call', 'deprecated_call',
'fixture', 'fixture',
'yield_fixture' 'yield_fixture',
'fail',
'skip',
'importorskip',
'exit',
] ]
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'
@ -35,8 +40,7 @@ from _pytest.freeze_support import freeze_includes
from _pytest import __version__ from _pytest import __version__
from _pytest.debugging import pytestPDB as __pytestPDB from _pytest.debugging import pytestPDB as __pytestPDB
from _pytest.recwarn import warns, deprecated_call from _pytest.recwarn import warns, deprecated_call
from _pytest.runner import fail, skip, importorskip, exit
set_trace = __pytestPDB.set_trace set_trace = __pytestPDB.set_trace
_preloadplugins() # to populate pytest.* namespace so help(pytest) works _preloadplugins() # to populate pytest.* namespace so help(pytest) works