Skip to content

Commit

Permalink
Merge pull request pytest-dev#3654 from LeastAuthority/3653.deprecate…
Browse files Browse the repository at this point in the history
…d-convert

Switch to new API
  • Loading branch information
nicoddemus authored Jul 4, 2018
2 parents b509112 + b84a646 commit 3ed8e28
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog/3653.trivial.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix usage of ``attr.ib`` deprecated ``convert`` parameter.
2 changes: 1 addition & 1 deletion src/_pytest/mark/structures.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ def _marked(func, mark):
class MarkInfo(object):
""" Marking object created by :class:`MarkDecorator` instances. """

_marks = attr.ib(convert=list)
_marks = attr.ib(converter=list)

@_marks.validator
def validate_marks(self, attribute, value):
Expand Down

0 comments on commit 3ed8e28

Please sign in to comment.