Fix more formatting

Author: DominicOram

ophyd/status.py

@@ -610,8 +610,10 @@ def __repr__(self):
         return "({self.left!r} & {self.right!r})".format(self=self)
 
     def __str__(self):
-        return "{0}(done={1.done}, success={1.success})".format(
-            self.__class__.__name__, self
+        return (
+            "{0}(done={1.done}, "
+            "success={1.success})"
+            "".format(self.__class__.__name__, self)
         )
 
     def __contains__(self, status: StatusBase) -> bool:
@@ -659,8 +661,11 @@ def __init__(self, obj=None, timeout=None, settle_time=0, done=None, success=Non
         self._trace_attributes["no_obj_given"] = not bool(obj)
 
     def __str__(self):
-        return "{0}(obj={1.obj}, done={1.done}, success={1.success})".format(
-            self.__class__.__name__, self
+        return (
+            "{0}(obj={1.obj}, "
+            "done={1.done}, "
+            "success={1.success})"
+            "".format(self.__class__.__name__, self)
         )
 
     __repr__ = __str__
@@ -705,8 +710,10 @@ def _handle_failure(self):
 
     def __str__(self):
         device_name = self.device.name if self.device else "None"
-        return "{0}(device={2}, done={1.done}, success={1.success})".format(
-            self.__class__.__name__, self, device_name
+        return (
+            "{0}(device={2}, done={1.done}, "
+            "success={1.success})"
+            "".format(self.__class__.__name__, self, device_name)
         )
 
     def watch(self, func):

ophyd/tests/test_status.py

@@ -1,5 +1,5 @@
 import time
-from unittest.mock import Mock, MagicMock
+from unittest.mock import MagicMock, Mock
 
 import pytest