Skip to content

Commit 5796182

Browse files
remove pytest_namespace from _pytest/runner.py
1 parent f69972d commit 5796182

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

_pytest/runner.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@
88
from _pytest._code.code import TerminalRepr, ExceptionInfo
99

1010

11-
def pytest_namespace():
12-
return {
13-
'fail' : fail,
14-
'skip' : skip,
15-
'importorskip' : importorskip,
16-
'exit' : exit,
17-
}
1811

1912
#
2013
# pytest plugin hooks

pytest.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@
1515
'warns',
1616
'deprecated_call',
1717
'fixture',
18-
'yield_fixture'
18+
'yield_fixture',
19+
'fail',
20+
'skip',
21+
'importorskip',
22+
'exit',
23+
1924
]
2025

2126
if __name__ == '__main__': # if run as a script or by 'python -m pytest'
@@ -35,8 +40,7 @@
3540
from _pytest import __version__
3641
from _pytest.debugging import pytestPDB as __pytestPDB
3742
from _pytest.recwarn import warns, deprecated_call
38-
39-
43+
from _pytest.runner import fail, skip, importorskip, exit
4044
set_trace = __pytestPDB.set_trace
4145

4246
_preloadplugins() # to populate pytest.* namespace so help(pytest) works

0 commit comments

Comments
 (0)