mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Closes #25685: Merged fix from 3.5.

Browse source
This commit is contained in:
Vinay Sajip 2015-12-26 12:51:43 +00:00
commit c1681674d4
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/logging/handlers.py
View file

@ -597,6 +597,8 @@ class SocketHandler(logging.Handler):
d['msg'] = record.getMessage() d['msg'] = record.getMessage()
d['args'] = None d['args'] = None
d['exc_info'] = None d['exc_info'] = None
# Issue #25685: delete 'message' if present: redundant with 'msg'
d.pop('message', None)
s = pickle.dumps(d, 1) s = pickle.dumps(d, 1)
slen = struct.pack(">L", len(s)) slen = struct.pack(">L", len(s))
return slen + s return slen + s