Merge branch 'release/3.14.0'

SpamScope · Nov 24, 2020 · 9791b2d · 9791b2d
2 parents 9b3f638 + 3e985be
commit 9791b2d
Show file tree

Hide file tree

Showing 4 changed files with 5,707 additions and 1 deletion.
diff --git a/mailparser/mailparser.py b/mailparser/mailparser.py
@@ -18,6 +18,7 @@
 """
 
 from __future__ import unicode_literals
+import base64
 import email
 import logging
 import os
@@ -383,6 +384,14 @@ def parse(self):
                         binary = True
                         log.debug("Filename {!r} part {!r} is binary".format(
                             filename, i))
+                    elif "uuencode" in transfer_encoding:
+                        # Re-encode in base64
+                        payload = base64.b64encode(
+                            p.get_payload(decode=True)).decode('ascii')
+                        binary = True
+                        transfer_encoding = "base64"
+                        log.debug("Filename {!r} part {!r} is binary (uuencode"
+                                  " re-encoded to base64)".format(filename, i))
                     else:
                         payload = ported_string(
                             p.get_payload(decode=True), encoding=charset)

diff --git a/mailparser/version.py b/mailparser/version.py
@@ -17,7 +17,7 @@
 limitations under the License.
 """
 
-__version__ = "3.13.0"
+__version__ = "3.14.0"
 
 if __name__ == "__main__":
     print(__version__)