Closes #25685: Merged fix from 3.5.

2015-12-26 12:51:43 +00:00 · 2015-12-26 12:51:43 +00:00 · c1681674d4
commit c1681674d4
parent aab9f46c6d 9cdfd18fc6
1 changed files with 2 additions and 0 deletions
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@ -597,6 +597,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