Skip to content

Commit

Permalink
Merge pull request #3684 from Vlad-Shcherbina/type_comments
Browse files Browse the repository at this point in the history
Replace broken type annotations with type comments
  • Loading branch information
nicoddemus authored Jul 15, 2018
2 parents 82a11e6 + 58e77f5 commit 771d3e8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions changelog/3635.trivial.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Replace broken type annotations with type comments.
4 changes: 2 additions & 2 deletions src/_pytest/mark/structures.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ class Mark(object):
#: name of the mark
name = attr.ib(type=str)
#: positional arguments of the mark decorator
args = attr.ib(type="List[object]")
args = attr.ib() # type: List[object]
#: keyword arguments of the mark decorator
kwargs = attr.ib(type="Dict[str, object]")
kwargs = attr.ib() # type: Dict[str, object]

def combined_with(self, other):
"""
Expand Down

0 comments on commit 771d3e8

Please sign in to comment.