remove pytest_namespace from _pytest.freeze_support

This commit is contained in:
Ronny Pfannschmidt 2017-02-28 13:34:38 +01:00
parent 5818e65cf3
commit fab9b993f8
3 changed files with 5 additions and 4 deletions

View File

@ -101,6 +101,7 @@ default_plugins = (
"junitxml resultlog doctest cacheprovider freeze_support "
"setuponly setupplan warnings").split()
builtin_plugins = set(default_plugins)
builtin_plugins.add("pytester")

View File

@ -5,9 +5,6 @@ pytest
from __future__ import absolute_import, division, print_function
def pytest_namespace():
return {'freeze_includes': freeze_includes}
def freeze_includes():
"""

View File

@ -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