Merge remote-tracking branch 'upstream/master' into merge-master-into-features

doc/en/example/assertion/failure_demo.py

@@ -245,9 +245,9 @@ class TestCustomAssertMsg(object):
             a = 1
 
         b = 2
-        assert A.a == b, (
-            "A.a appears not to be b\n" "or does not appear to be b\none of those"
-        )
+        assert (
+            A.a == b
+        ), "A.a appears not to be b\nor does not appear to be b\none of those"
 
     def test_custom_repr(self):
         class JSON(object):

doc/en/example/reportingdemo.rst

@@ -582,7 +582,7 @@ get on the terminal - we are working on that)::
             b = 2
     >       assert (
                 A.a == b
-            ), "A.a appears not to be b\n" "or does not appear to be b\none of those"
+            ), "A.a appears not to be b\nor does not appear to be b\none of those"
     E       AssertionError: A.a appears not to be b
     E         or does not appear to be b
     E         one of those

doc/en/reference.rst

@@ -178,7 +178,7 @@ Mark a test function as using the given fixture names.
 
 .. warning::
 
-    This mark can be used with *test functions* only, having no affect when applied
+    This mark has no effect when applied
     to a **fixture** function.
 
 .. py:function:: pytest.mark.usefixtures(*names)