From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sat, 26 Dec 2015 12:48:44 +0000 (+0000)
Subject: Closes #25685: Made SocketHandler emission more efficient.
X-Git-Tag: v3.6.0a1~863^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9cdfd18fc6357f1fe343e815196cbe1db2a17af5;p=thirdparty%2FPython%2Fcpython.git

Closes #25685: Made SocketHandler emission more efficient.
---

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index b810fa9c5839..c6840c30b35b 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -588,6 +588,8 @@ class SocketHandler(logging.Handler):
         d['msg'] = record.getMessage()
         d['args'] = None
         d['exc_info'] = None
+        # Issue #25685: delete 'message' if present: redundant with 'msg'
+        d.pop('message', None)
         s = pickle.dumps(d, 1)
         slen = struct.pack(">L", len(s))
         return slen + s