Skip to content

Commit 2c03000

Browse files
authored
Merge pull request #2585 from RonnyPfannschmidt/fix-2573
remove the MARK_INFO_ATTRIBUTE warning until we can fix internal usage
2 parents 1485a3a + 62556ba commit 2c03000

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

_pytest/mark.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from collections import namedtuple
77
from operator import attrgetter
88
from .compat import imap
9-
from .deprecated import MARK_INFO_ATTRIBUTE, MARK_PARAMETERSET_UNPACKING
9+
from .deprecated import MARK_PARAMETERSET_UNPACKING
1010

1111
def alias(name, warning=None):
1212
getter = attrgetter(name)
@@ -401,9 +401,9 @@ def __init__(self, mark):
401401
self.combined = mark
402402
self._marks = [mark]
403403

404-
name = alias('combined.name', warning=MARK_INFO_ATTRIBUTE)
405-
args = alias('combined.args', warning=MARK_INFO_ATTRIBUTE)
406-
kwargs = alias('combined.kwargs', warning=MARK_INFO_ATTRIBUTE)
404+
name = alias('combined.name')
405+
args = alias('combined.args')
406+
kwargs = alias('combined.kwargs')
407407

408408
def __repr__(self):
409409
return "<MarkInfo {0!r}>".format(self.combined)

0 commit comments

Comments
 (0)