p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2585 from RonnyPfannschmidt/fix-2573 

remove the MARK_INFO_ATTRIBUTE warning until we can fix internal usage
This commit is contained in:
Bruno Oliveira 2017-07-19 07:46:38 -03:00 committed by GitHub
parent 1485a3a902 62556bada6
commit 2c03000b96
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_pytest/mark.py
View File

@ -6,7 +6,7 @@ import warnings
from collections import namedtuple from collections import namedtuple
from operator import attrgetter from operator import attrgetter
from .compat import imap from .compat import imap
from .deprecated import MARK_INFO_ATTRIBUTE, MARK_PARAMETERSET_UNPACKING from .deprecated import MARK_PARAMETERSET_UNPACKING
def alias(name, warning=None): def alias(name, warning=None):
getter = attrgetter(name) getter = attrgetter(name)
@ -401,9 +401,9 @@ class MarkInfo(object):
self.combined = mark self.combined = mark
self._marks = [mark] self._marks = [mark]
name = alias('combined.name', warning=MARK_INFO_ATTRIBUTE) name = alias('combined.name')
args = alias('combined.args', warning=MARK_INFO_ATTRIBUTE) args = alias('combined.args')
kwargs = alias('combined.kwargs', warning=MARK_INFO_ATTRIBUTE) kwargs = alias('combined.kwargs')
def __repr__(self): def __repr__(self):
return "<MarkInfo {0!r}>".format(self.combined) return "<MarkInfo {0!r}>".format(self.combined)