Avoid string formatting if not producing any log output

sebastinas · sebastinas · commit 5cc2c3f8434d · 2022-08-30T00:01:37.000+02:00
diff --git a/bpython/args.py b/bpython/args.py
@@ -204,24 +204,17 @@ def callback(group):
         bpython_logger.addHandler(logging.NullHandler())
         curtsies_logger.addHandler(logging.NullHandler())
 
-    logger.info(f"Starting bpython {__version__}")
-    logger.info(f"Python {sys.executable}: {sys.version_info}")
-    logger.info(f"curtsies: {curtsies.__version__}")
-    logger.info(f"cwcwidth: {cwcwidth.__version__}")
-    logger.info(f"greenlet: {greenlet.__version__}")
-    logger.info(f"pygments: {pygments.__version__}")  # type: ignore
-    logger.info(f"requests: {requests.__version__}")
-    logger.info(
-        "environment:\n{}".format(
-            "\n".join(
-                f"{key}: {value}"
-                for key, value in sorted(os.environ.items())
-                if key.startswith("LC")
-                or key.startswith("LANG")
-                or key == "TERM"
-            )
-        )
-    )
+    logger.info("Starting bpython %s", __version__)
+    logger.info("Python %s: %s", sys.executable, sys.version_info)
+    logger.info("curtsies: %s", curtsies.__version__)
+    logger.info("cwcwidth: %s", cwcwidth.__version__)
+    logger.info("greenlet: %s", greenlet.__version__)
+    logger.info("pygments: %s", pygments.__version__)  # type: ignore
+    logger.info("requests: %s", requests.__version__)
+    logger.info("environment:")
+    for key, value in sorted(os.environ.items()):
+        if key.startswith("LC") or key.startswith("LANG") or key == "TERM":
+            logger.info("%s: %s", key, value)
 
     return Config(options.config), options, options.args
 
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -55,6 +55,8 @@
 from .importcompletion import ModuleGatherer
 
 
+logger = logging.getLogger(__name__)
+
 # Autocomplete modes
 class AutocompleteModes(Enum):
     NONE = "none"
@@ -767,11 +769,8 @@ def get_completer(
             )
         except Exception as e:
             # Instead of crashing the UI, log exceptions from autocompleters.
-            logger = logging.getLogger(__name__)
             logger.debug(
-                "Completer {} failed with unhandled exception: {}".format(
-                    completer, e
-                )
+                "Completer %r failed with unhandled exception: %s", completer, e
             )
             continue
         if matches is not None:
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1005,7 +1005,7 @@ def only_whitespace_left_of_cursor():
             """returns true if all characters before cursor are whitespace"""
             return not self.current_line[: self.cursor_offset].strip()
 
-        logger.debug("self.matches_iter.matches:%r", self.matches_iter.matches)
+        logger.debug("self.matches_iter.matches: %r", self.matches_iter.matches)
         if only_whitespace_left_of_cursor():
             front_ws = len(self.current_line[: self.cursor_offset]) - len(
                 self.current_line[: self.cursor_offset].lstrip()
