Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "introduce deprecation warnings for legacy parametersets" #2584

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions _pytest/deprecated.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,4 @@ class RemovedInPytest4Warning(DeprecationWarning):

MARK_INFO_ATTRIBUTE = RemovedInPytest4Warning(
"MarkInfo objects are deprecated as they contain the merged marks"
)

MARK_PARAMETERSET_UNPACKING = RemovedInPytest4Warning(
"Applying marks directly to parameters is deprecated,"
" please use pytest.param(..., marks=...) instead.\n"
"For more details, see: https://docs.pytest.org/en/latest/parametrize.html"
)
5 changes: 1 addition & 4 deletions _pytest/mark.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from collections import namedtuple
from operator import attrgetter
from .compat import imap
from .deprecated import MARK_INFO_ATTRIBUTE, MARK_PARAMETERSET_UNPACKING
from .deprecated import MARK_INFO_ATTRIBUTE

def alias(name, warning=None):
getter = attrgetter(name)
Expand Down Expand Up @@ -61,9 +61,6 @@ def extract_from(cls, parameterset, legacy_force_tuple=False):
if legacy_force_tuple:
argval = argval,

if newmarks:
warnings.warn(MARK_PARAMETERSET_UNPACKING)

return cls(argval, marks=newmarks, id=None)

@property
Expand Down
1 change: 0 additions & 1 deletion changelog/2427.removal

This file was deleted.