From 834a658dfbe25707eebed34d5f5fdd10e1fddd60 Mon Sep 17 00:00:00 2001 From: Patrick Totzke Date: Sun, 1 Jul 2018 15:43:16 +0100 Subject: remove workaround for python issue that was solved upstream: https://bugs.python.org/issue14983 --- alot/helper.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/alot/helper.py b/alot/helper.py index 46dbb782..b7b7d25d 100644 --- a/alot/helper.py +++ b/alot/helper.py @@ -607,19 +607,6 @@ def email_as_string(mail): g = Generator(fp, mangle_from_=False, maxheaderlen=78) g.flatten(mail) as_string = RFC3156_canonicalize(fp.getvalue()) - - if isinstance(mail, MIMEMultipart): - # Get the boundary for later - boundary = mail.get_boundary() - - # Workaround for http://bugs.python.org/issue14983: - # Insert a newline before the outer mail boundary so that other mail - # clients can verify the signature when sending an email which contains - # attachments. - as_string = re.sub(r'--(\r\n)--' + boundary, - r'--\g<1>\g<1>--' + boundary, - as_string, flags=re.MULTILINE) - return as_string -- cgit v1.2.3