Accept suggestions from new toolchain

rec · rec · commit 98af28a241cb · 2026-02-03T14:18:10.000+01:00
diff --git a/backer/__init__.py b/backer/__init__.py
@@ -1 +0,0 @@
-
diff --git a/backer/__main__.py b/backer/__main__.py
@@ -1,8 +1,10 @@
+import time
+
+import yaml
+
 from . import config, signal_handler, stoppable_thread
 from .execute import Execute
 from .task import task_class
-import time
-import yaml
 
 
 class MainThread(stoppable_thread.StoppableThread):
diff --git a/backer/config.py b/backer/config.py
@@ -6,14 +6,15 @@
 configure the program, otherwise stdin is read.
 """
 
-from . import describe
-from . import task as _task
-from . import variables
-from pathlib import Path
 import argparse
 import os
+from pathlib import Path
+
 import yaml
 
+from . import describe, variables
+from . import task as _task
+
 STEM = Path("backer")
 SUFFIXES = ".yml", ".yaml", ".json"
 
diff --git a/backer/execute.py b/backer/execute.py
@@ -1,8 +1,10 @@
-from .stoppable_thread import Stoppable, StoppableThreadList
-from watchdog import observers
+import time
+
 import run_subprocess as rs
 import schedule as _schedule
-import time
+from watchdog import observers
+
+from .stoppable_thread import Stoppable, StoppableThreadList
 
 
 class Execute(StoppableThreadList):
diff --git a/backer/signal_handler.py b/backer/signal_handler.py
@@ -35,7 +35,7 @@ def set_all(handler):
 
             running = all(s in restarts for s in signals)
             msg = "restarting" if running else "stopping"
-            print("Received signal %s: %s" % (" ".join(signals), msg))
+            print("Received signal {}: {}".format(" ".join(signals), msg))
             signals.clear()
             if not running:
                 return
diff --git a/backer/task/__init__.py b/backer/task/__init__.py
@@ -3,7 +3,7 @@
 
 def task_class(name):
     if "." not in name:
-        name = "%s.%s" % (__package__, name)
+        name = f"{__package__}.{name}"
 
     mod = importlib.import_module(name)
     r = name.split(".")[-1].lower()
diff --git a/backer/task/_database.py b/backer/task/_database.py
@@ -1,4 +1,4 @@
-from ._scheduled import dataclass, ScheduledCommandTask
+from ._scheduled import ScheduledCommandTask, dataclass
 
 
 @dataclass
diff --git a/backer/task/_scheduled.py b/backer/task/_scheduled.py
@@ -1,6 +1,7 @@
-from ._task import dataclass, Task
 from pathlib import Path
 
+from ._task import Task, dataclass
+
 
 @dataclass
 class ScheduledCommandTask(Task):
@@ -38,7 +39,7 @@ def add(self, *args, **kwds):
                 flag = flag.replace("_", "-")
                 flag = ("-" if len(flag) == 1 else "--") + flag
                 if value is not True:
-                    flag = "%s=%s" % (flag, value)
+                    flag = f"{flag}={value}"
                 self.add(flag)
 
     __dataclass_docs__ = """
diff --git a/backer/task/_task.py b/backer/task/_task.py
@@ -1,5 +1,5 @@
-from dataclasses import dataclass
 import shlex
+from dataclasses import dataclass
 
 
 @dataclass
diff --git a/backer/task/git.py b/backer/task/git.py
@@ -1,12 +1,13 @@
-from ._task import Task
-from dataclasses import dataclass
-from pathlib import Path
-from queue import Queue, Empty
 import datetime
 import functools
 import os
 import sys
 import time
+from dataclasses import dataclass
+from pathlib import Path
+from queue import Empty, Queue
+
+from ._task import Task
 
 # How long before timing out the service queue?
 QUEUE_TIMEOUT = 1
diff --git a/backer/task/rsync.py b/backer/task/rsync.py
@@ -1,6 +1,7 @@
-from ._scheduled import ScheduledCommandTask
 from dataclasses import dataclass
 
+from ._scheduled import ScheduledCommandTask
+
 
 @dataclass
 class Rsync(ScheduledCommandTask):
diff --git a/backer/variables.py b/backer/variables.py
@@ -17,10 +17,11 @@
     ${VAR?err} - throws an exception containing err if VAR is unset
 """
 
-from pathlib import Path
-import dotenv
 import os
 import re
+from pathlib import Path
+
+import dotenv
 
 DOCKER_RE = re.compile(
     r"""
@@ -67,7 +68,7 @@ def _apply(s, env):
     assert len(split) % 6 == 1
     env = os.environ if env is None else env or {}
 
-    for before, name1, name2, colon, sep, arg in zip(*[iter(split)] * 6):
+    for before, name1, name2, colon, sep, arg in zip(*[iter(split)] * 6, strict=True):
         yield before.format(**env or {})
 
         if name1 == "" or name2 == "":
diff --git a/test/patch.py b/test/patch.py
@@ -1,11 +1,13 @@
-from backer import execute
-from backer.__main__ import Main
-from tempfile import TemporaryDirectory
-from unittest import mock
 import time
 import unittest
+from tempfile import TemporaryDirectory
+from unittest import mock
+
 import yaml
 
+from backer import execute
+from backer.__main__ import Main
+
 
 class FakeExecuteKeepRun(execute.Execute):
     def __init__(self):
diff --git a/test/test_config.py b/test/test_config.py
@@ -1,10 +1,9 @@
-from backer import config
-from backer import describe
-from backer import task
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from unittest import TestCase
 
+from backer import config, describe, task
+
 SECTIONS = ("git", "mongodb", "mysql", "postgresql", "rsync")
 TASKS = {s: task.task_class(s) for s in SECTIONS}
 LINE = ":\n".join(TASKS) + ":"
diff --git a/test/test_describe.py b/test/test_describe.py
@@ -1,8 +1,9 @@
-from backer_doc import __main__
 import functools
 import io
 import unittest
 
+from backer_doc import __main__
+
 
 class TestDescribe(unittest.TestCase):
     def DONT_test_all(self):
diff --git a/test/test_git.py b/test/test_git.py
@@ -1,6 +1,7 @@
-from . import patch
 from gitz.git import GIT, repo
 
+from . import patch
+
 
 @patch.execute_keep_run
 class TestMain(patch.MainTester):
diff --git a/test/test_main.py b/test/test_main.py
@@ -1,6 +1,7 @@
-from . import patch
 import yaml
 
+from . import patch
+
 
 @patch.execute
 class TestMain(patch.MainTester):
diff --git a/test/test_rsync.py b/test/test_rsync.py
@@ -1,7 +1,8 @@
-from . import patch
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
+from . import patch
+
 
 @patch.execute_keep_run
 class TestRsync(patch.MainTester):
diff --git a/test/test_variables.py b/test/test_variables.py
@@ -1,6 +1,7 @@
-from backer import variables
 import unittest
 
+from backer import variables
+
 
 class VariablesTest(unittest.TestCase):
     def test_simple(self):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from ._scheduled import dataclass, ScheduledCommandTask`
	`1`	`+from ._scheduled import ScheduledCommandTask, dataclass`
`2`	`2`
`3`	`3`
`4`	`4`	`@dataclass`