Skip to content

Commit c168167

Browse files
committed
Closes python#25685: Merged fix from 3.5.
2 parents aab9f46 + 9cdfd18 commit c168167

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

Lib/logging/handlers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -597,6 +597,8 @@ def makePickle(self, record):
597597
d['msg'] = record.getMessage()
598598
d['args'] = None
599599
d['exc_info'] = None
600+
# Issue #25685: delete 'message' if present: redundant with 'msg'
601+
d.pop('message', None)
600602
s = pickle.dumps(d, 1)
601603
slen = struct.pack(">L", len(s))
602604
return slen + s

0 commit comments

Comments
 (0)