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

remove pytest_namespace from _pytest.main

This commit is contained in:
Ronny Pfannschmidt 2017-02-28 17:41:20 +01:00
parent 61f418a267
commit 99c8f2d403
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_pytest/main.py
View File

@ -77,11 +77,6 @@ def pytest_addoption(parser):
help="base temporary directory for this test run.") help="base temporary directory for this test run.")
def pytest_namespace():
collect = dict(Item=Item, Collector=Collector, File=File, Session=Session)
return dict(collect=collect)
def pytest_configure(config): def pytest_configure(config):
pytest.config = config # compatibility pytest.config = config # compatibility

11
pytest.py
View File

@ -23,6 +23,14 @@ __all__ = [
'exit', 'exit',
'mark', 'mark',
'_fillfuncargs',
'Item',
'File',
'Collector',
'Session',
] ]
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'
@ -45,7 +53,10 @@ from _pytest.recwarn import warns, deprecated_call
from _pytest.runner import fail, skip, importorskip, exit from _pytest.runner import fail, skip, importorskip, exit
from _pytest.mark import MARK_GEN as mark from _pytest.mark import MARK_GEN as mark
from _pytest.skipping import xfail from _pytest.skipping import xfail
from _pytest.main import Item, Collector, File, Session
from _pytest.fixtures import fillfixtures as _fillfuncargs from _pytest.fixtures import fillfixtures as _fillfuncargs
set_trace = __pytestPDB.set_trace set_trace = __pytestPDB.set_trace