diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2015-12-26 12:51:43 (GMT) |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2015-12-26 12:51:43 (GMT) |
| commit | c1681674d41e7acc50e76e39fefcfe4d3ac90073 (patch) | |
| tree | 20e0886a27125df2a9e26b492a408e19a826cff4 /Lib/logging | |
| parent | aab9f46c6d5508383709f8722a9328fa76dd8c1b (diff) | |
| parent | 9cdfd18fc6357f1fe343e815196cbe1db2a17af5 (diff) | |
| download | cpython-c1681674d41e7acc50e76e39fefcfe4d3ac90073.zip cpython-c1681674d41e7acc50e76e39fefcfe4d3ac90073.tar.gz cpython-c1681674d41e7acc50e76e39fefcfe4d3ac90073.tar.bz2 | |
Closes #25685: Merged fix from 3.5.
Diffstat (limited to 'Lib/logging')
| -rw-r--r-- | Lib/logging/handlers.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index fba04f1..6425356 100644 --- 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 |