summaryrefslogtreecommitdiff
path: root/pytest.py
diff options
context:
space:
mode:
authorRonny Pfannschmidt <ronny.pfannschmidt@redhat.com>2017-02-28 13:34:38 +0100
committerRonny Pfannschmidt <ronny.pfannschmidt@redhat.com>2017-03-28 11:45:06 +0200
commitfab9b993f80ce696e7be41bcd76a415a9fdce7c6 (patch)
tree99200f486b08cb6102e92e1bfa92487f3712f641 /pytest.py
parent5818e65cf3407f672bfc9b50c54385e45a1ef98b (diff)
downloadpytest-fab9b993f80ce696e7be41bcd76a415a9fdce7c6.tar.gz
remove pytest_namespace from _pytest.freeze_support
Diffstat (limited to 'pytest.py')
-rw-r--r--pytest.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pytest.py b/pytest.py
index 26667f5e5..741e2d7f6 100644
--- a/pytest.py
+++ b/pytest.py
@@ -9,7 +9,8 @@ __all__ = [
'hookspec',
'hookimpl',
'__version__',
- 'register_assert_rewrite'
+ 'register_assert_rewrite',
+ 'freeze_includes',
]
if __name__ == '__main__': # if run as a script or by 'python -m pytest'
@@ -24,7 +25,9 @@ from _pytest.config import (
hookspec, hookimpl
)
from _pytest.assertion import register_assert_rewrite
+from _pytest.freeze_support import freeze_includes
from _pytest import __version__
+
_preloadplugins() # to populate pytest.* namespace so help(pytest) works