From 803361b850f87fcc2a89c0c01de0d49db64b3f64 Mon Sep 17 00:00:00 2001
From: Dan Helfman <witten@torsion.org>
Date: Sun, 26 Jan 2025 09:12:18 -0800
Subject: [PATCH] Some text fixes (#635).

---
 borgmatic/logger.py       | 10 ++++++----
 tests/unit/test_logger.py |  7 +++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/borgmatic/logger.py b/borgmatic/logger.py
index 8869168d..a2eceacd 100644
--- a/borgmatic/logger.py
+++ b/borgmatic/logger.py
@@ -298,8 +298,10 @@ def configure_logging(
             syslog_handler = logging.handlers.SysLogHandler(address=syslog_path)
             syslog_handler.setFormatter(
                 logging.Formatter(
-                    'borgmatic: {levelname} {prefix}{message}', style='{', defaults={'prefix': ''}
-                )  # noqa: FS003
+                    'borgmatic: {levelname} {prefix}{message}',  # noqa: FS003
+                    style='{',
+                    defaults={'prefix': ''},
+                )
             )
             syslog_handler.setLevel(syslog_log_level)
             handlers.append(syslog_handler)
@@ -308,9 +310,9 @@ def configure_logging(
         file_handler = logging.handlers.WatchedFileHandler(log_file)
         file_handler.setFormatter(
             logging.Formatter(
-                log_file_format or '[{asctime}] {levelname}: {prefix}{message}',
+                log_file_format or '[{asctime}] {levelname}: {prefix}{message}',  # noqa: FS003
                 style='{',
-                defaults={'prefix': ''},  # noqa: FS003
+                defaults={'prefix': ''},
             )
         )
         file_handler.setLevel(log_file_log_level)
diff --git a/tests/unit/test_logger.py b/tests/unit/test_logger.py
index 442d65c0..cc6619ed 100644
--- a/tests/unit/test_logger.py
+++ b/tests/unit/test_logger.py
@@ -177,8 +177,9 @@ def test_multi_stream_handler_logs_to_handler_for_log_level():
 def test_console_color_formatter_format_includes_log_message():
     flexmock(module).should_receive('add_custom_log_levels')
     flexmock(module.logging).ANSWER = module.ANSWER
+    flexmock(module.logging.Formatter).should_receive('format')
     plain_message = 'uh oh'
-    record = flexmock(levelno=logging.CRITICAL, msg=plain_message)
+    record = flexmock(levelno=logging.CRITICAL)
 
     colored_message = module.Console_color_formatter().format(record)
 
@@ -409,7 +410,9 @@ def test_configure_logging_to_log_file_formats_with_custom_log_format():
     flexmock(module).should_receive('add_custom_log_levels')
     flexmock(module.logging).ANSWER = module.ANSWER
     flexmock(module.logging).should_receive('Formatter').with_args(
-        '{message}', style='{'  # noqa: FS003
+        '{message}',  # noqa: FS003
+        style='{',
+        defaults={'prefix': ''},
     ).once()
     fake_formatter = flexmock()
     flexmock(module).should_receive('Console_color_formatter').and_return(fake_formatter)