From: Harsh Parekh <harsh_parekh@outlook.com>
Date: Thu, 27 Feb 2025 16:45:44 +0000 (-0500)
Subject: Format HTTPError.log_message only if args provided
X-Git-Tag: v6.5.0b1~14^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec08dd3f1ecf70a647cc56ad5447abe41b833ddb;p=thirdparty%2Ftornado.git

Format HTTPError.log_message only if args provided

Attempts to fix the [jupyter_server/issues/1503](https://github.com/jupyter-server/jupyter_server/issues/1503) issue
---

diff --git a/tornado/web.py b/tornado/web.py
index 357c5f1a..3003fd8e 100644
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -2520,8 +2520,6 @@ class HTTPError(Exception):
         self.log_message = log_message
         self.args = args
         self.reason = kwargs.get("reason", None)
-        if log_message and not args:
-            self.log_message = log_message.replace("%", "%%")
 
     def __str__(self) -> str:
         message = "HTTP %d: %s" % (
@@ -2529,7 +2527,8 @@ class HTTPError(Exception):
             self.reason or httputil.responses.get(self.status_code, "Unknown"),
         )
         if self.log_message:
-            return message + " (" + (self.log_message % self.args) + ")"
+            log_message = (self.log_message % self.args) if self.args else self.log_message
+            return message + " (" + log_message + ")"
         else:
             return message