From 0a1776fc9fdf8e03757f2ccc08f5267489472432 Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Fri, 11 Jun 2021 09:59:21 -0400 Subject: Save mbox files with proper unixfrom In order to avoid some of the more obscure charset encoding problems, we switched to using as_string() for generating messages before saving them in an mbox file. However, this uncovered a bug where the unixfrom was not actually generated and saved, despite as_bytes() and as_string() supposedly behaving identically. See: https://docs.python.org/3/library/email.message.html#email.message.EmailMessage.as_string This commit fixes the problem by properly setting the unixfrom and using the recommended (and hopefully less buggy) email.generator interface when saving mailboxes. Reported-by: Geert Uytterhoeven Signed-off-by: Konstantin Ryabitsev --- b4/pr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'b4/pr.py') diff --git a/b4/pr.py b/b4/pr.py index f0d990e..c5c5fc7 100644 --- a/b4/pr.py +++ b/b4/pr.py @@ -586,7 +586,7 @@ def main(cmdargs): if save_maildir: b4.save_maildir(msgs, savefile) else: - with open(savefile, 'wb') as fh: + with open(savefile, 'w') as fh: b4.save_git_am_mbox(msgs, fh) logger.info('---') logger.info('Saved %s', savefile) -- cgit v1.2.3