summaryrefslogtreecommitdiff
path: root/_pytest/mark
diff options
context:
space:
mode:
Diffstat (limited to '_pytest/mark')
-rw-r--r--_pytest/mark/legacy.py2
-rw-r--r--_pytest/mark/structures.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/_pytest/mark/legacy.py b/_pytest/mark/legacy.py
index 5c7b8d001..30c7239bf 100644
--- a/_pytest/mark/legacy.py
+++ b/_pytest/mark/legacy.py
@@ -17,7 +17,7 @@ class MarkMapping(object):
@classmethod
def from_item(cls, item):
- mark_names = set(mark.name for mark in item.iter_markers())
+ mark_names = {mark.name for mark in item.iter_markers()}
return cls(mark_names)
def __getitem__(self, name):
diff --git a/_pytest/mark/structures.py b/_pytest/mark/structures.py
index 72fd264b2..8ec6bbce9 100644
--- a/_pytest/mark/structures.py
+++ b/_pytest/mark/structures.py
@@ -296,7 +296,7 @@ class MarkInfo(object):
return cls([mark])
def __repr__(self):
- return "<MarkInfo {0!r}>".format(self.combined)
+ return "<MarkInfo {!r}>".format(self.combined)
def add_mark(self, mark):
""" add a MarkInfo with the given args and kwargs. """