Skip to content

Commit 1affc39

Browse files
remove the namespace hook from mark after the param feature merge
1 parent 22cb978 commit 1affc39

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

_pytest/mark.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@ class MarkerError(Exception):
6666
"""Error in use of a pytest marker/attribute."""
6767

6868

69-
def pytest_namespace():
70-
return {
71-
'param': ParameterSet.param,
72-
}
69+
def param(*values, **kw):
70+
return ParameterSet.param(*values, **kw)
7371

7472

7573
def pytest_addoption(parser):

pytest.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from _pytest.debugging import pytestPDB as __pytestPDB
1818
from _pytest.recwarn import warns, deprecated_call
1919
from _pytest.runner import fail, skip, importorskip, exit
20-
from _pytest.mark import MARK_GEN as mark
20+
from _pytest.mark import MARK_GEN as mark, param
2121
from _pytest.skipping import xfail
2222
from _pytest.main import Item, Collector, File, Session
2323
from _pytest.fixtures import fillfixtures as _fillfuncargs
@@ -48,6 +48,7 @@
4848
'importorskip',
4949
'exit',
5050
'mark',
51+
'param',
5152
'approx',
5253
'_fillfuncargs',
5354

0 commit comments

Comments
 (0)