Move email_as_string function from crypto to helper module

The email_as_string function, and the related RFC3156_canonicalize
function, are now used by the ForwardCommand and are not specific
anymore to the crypto routine. So we move them to the global helper
module.

fix an import removal mistake while moving email_as_string function: StringIO was not only used by email_as_string

1 files changed, 0 insertions, 51 deletions

diff --git a/alot/crypto.py b/alot/crypto.py
index 1270485d..4c74f1bf 100644
--- a/alot/crypto.py
+++ b/alot/crypto.py
@@ -4,41 +4,11 @@
 import re
 import os
 
-from email.generator import Generator
 from cStringIO import StringIO
 from alot.errors import GPGProblem, GPGCode
-from email.mime.multipart import MIMEMultipart
 import gpgme
 
 
-def email_as_string(mail):
-    """
-    Converts the given message to a string, without mangling "From" lines
-    (like as_string() does).
-
-    :param mail: email to convert to string
-    :rtype: str
-    """
-    fp = StringIO()
-    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,
-                           '--\g<1>\g<1>--' + boundary,
-                           as_string, flags=re.MULTILINE)
-
-    return as_string
-
-
 def _hash_algo_name(hash_algo):
     """
     Re-implements GPGME's hash_algo_name as long as pygpgme doesn't wrap that
@@ -85,27 +55,6 @@ def RFC3156_micalg_from_algo(hash_algo):
     return 'pgp-' + hash_algo.lower()
 
 
-def RFC3156_canonicalize(text):
-    """
-    Canonicalizes plain text (MIME-encoded usually) according to RFC3156.
-
-    This function works as follows (in that order):
-
-    1. Convert all line endings to \\\\r\\\\n (DOS line endings).
-    2. Ensure the text ends with a newline (\\\\r\\\\n).
-    3. Encode all occurences of "From " at the beginning of a line
-       to "From=20" in order to prevent other mail programs to replace
-       this with "> From" (to avoid MBox conflicts) and thus invalidate
-       the signature.
-
-    :param text: text to canonicalize (already encoded as quoted-printable)
-    :rtype: str
-    """
-    text = re.sub("\r?\n", "\r\n", text)
-    if not text.endswith("\r\n"):
-        text += "\r\n"
-    text = re.sub("^From ", "From=20", text, flags=re.MULTILINE)
-    return text
 
 
 def get_key(keyid, validate=False, encrypt=False, sign=False):