From d8b647970f42718087eb78e7cdd8a2486cb5ee30 Mon Sep 17 00:00:00 2001 From: Thomas Hisch Date: Fri, 5 Nov 2021 23:08:30 +0100 Subject: [PATCH] Inline PercentStyleMultiline._update_message and take advantage of dict unpacking operator. --- src/_pytest/logging.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/_pytest/logging.py b/src/_pytest/logging.py index 7f73b8a46..31ad83010 100644 --- a/src/_pytest/logging.py +++ b/src/_pytest/logging.py @@ -118,14 +118,6 @@ class PercentStyleMultiline(logging.PercentStyle): super().__init__(fmt) self._auto_indent = self._get_auto_indent(auto_indent) - @staticmethod - def _update_message( - record_dict: Dict[str, object], message: str - ) -> Dict[str, object]: - tmp = record_dict.copy() - tmp["message"] = message - return tmp - @staticmethod def _get_auto_indent(auto_indent_option: Union[int, str, bool, None]) -> int: """Determine the current auto indentation setting. @@ -191,7 +183,7 @@ class PercentStyleMultiline(logging.PercentStyle): if auto_indent: lines = record.message.splitlines() - formatted = self._fmt % self._update_message(record.__dict__, lines[0]) + formatted = self._fmt % {**record.__dict__, "message": lines[0]} if auto_indent < 0: indentation = _remove_ansi_escape_sequences(formatted).find(