Removed invalid # type ignore and fixed None to "" given record.message is type str

madzak · madzak · commit d42f92c3f816 · 2022-11-29T13:40:01.000-08:00
diff --git a/src/pythonjsonlogger/jsonlogger.py b/src/pythonjsonlogger/jsonlogger.py
@@ -204,9 +204,9 @@ def format(self, record: logging.LogRecord) -> str:
         message_dict: Dict[str, Any] = {}
         # FIXME: logging.LogRecord.msg and logging.LogRecord.message in typeshed
         #        are always type of str. We shouldn't need to override that.
-        if isinstance(record.msg, dict):  # type: ignore
-            message_dict = record.msg  # type: ignore
-            record.message = None
+        if isinstance(record.msg, dict):
+            message_dict = record.msg
+            record.message = ""
         else:
             record.message = record.getMessage()
         # only format time if needed
diff --git a/tests/tests.py b/tests/tests.py
@@ -132,7 +132,7 @@ def testLogADict(self):
         self.assertEqual(logJson.get("num"), msg["num"])
         self.assertEqual(logJson.get("5"), msg[5])
         self.assertEqual(logJson.get("nested"), msg["nested"])
-        self.assertEqual(logJson["message"], None)
+        self.assertEqual(logJson["message"], "")
 
     def testLogExtra(self):
         fr = jsonlogger.JsonFormatter()
