mgr/cephadm: Multiple statements on one line (def) (E704)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 1738e22ec0b08ba225de55bf3772b6242c6cef2f)

diff --git a/src/pybind/mgr/cephadm/tests/test_scheduling.py b/src/pybind/mgr/cephadm/tests/test_scheduling.py
index e07819c37e909357ad25a2312ded26f688caf45b..1d41fcc9710ad20e270f8582c0a566914ae448f1 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_scheduling.py
+++ b/src/pybind/mgr/cephadm/tests/test_scheduling.py
@@ -69,7 +69,8 @@ def _or(expected, *inners):
         assert False, f"_or failed: {expected}"
 
 
-def _always_true(_): pass
+def _always_true(_):
+    pass
 
 
 def k(s):

diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
index 7bebb3da61e52c5d2dc68eaa3af8f4960585a6e4..b3543cc429a7472eadb061757d6c596991fd8fcd 100644 (file)
--- a/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@ -115,7 +115,8 @@ def handle_exception(prefix: str, perm: str, func: FuncT) -> FuncT:
 
 
 class InnerCliCommandCallable(Protocol):
-    def __call__(self, prefix: str) -> Callable[[FuncT], FuncT]: ...
+    def __call__(self, prefix: str) -> Callable[[FuncT], FuncT]:
+        ...
 
 
 def _cli_command(perm: str) -> InnerCliCommandCallable:

diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index aae1e95f2e5152b237ec7126aeac57873c64a862..d7f799c8202ed9dd98fbf6b0ed73aec829da2656 100644 (file)
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -12,7 +12,6 @@ requires = cython
 max-line-length = 100
 ignore =
     E501,
-    E704,
     E712,
     E722,
     E731,