sort out pyupgrade fallout

.pre-commit-config.yaml

@@ -13,6 +13,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: check-yaml
     -   id: debug-statements
+        exclude: _pytest/debugging.py
     -   id: flake8
 -   repo: https://github.com/asottile/pyupgrade
     rev: v1.2.0

_pytest/recwarn.py

@@ -227,7 +227,9 @@ class WarningsChecker(WarningsRecorder):
                             if re.compile(self.match_expr).search(str(r.message)):
                                 break
                     else:
-                        fail("DID NOT WARN. No warnings of type {} matching"
+                        fail(
+                            "DID NOT WARN. No warnings of type {} matching"
                             " ('{}') was emitted. The list of emitted warnings"
-                             " is: {}.".format(self.expected_warning, self.match_expr,
+                            " is: {}.".format(
+                                self.expected_warning, self.match_expr,
                                 [each.message for each in self]))

testing/test_mark.py

@@ -747,8 +747,10 @@ class TestFunctional(object):
         items = {x.name: x for x in items}
         for name, expected_markers in expected.items():
             markers = items[name].keywords._markers
-            marker_names = {name for (name, v) in markers.items()
+            marker_names = {
-                                if isinstance(v, MarkInfo)}
+                name for (name, v) in markers.items()
+                if isinstance(v, MarkInfo)
+            }
             assert marker_names == set(expected_markers)
 
     @pytest.mark.issue1540