X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=3f5879ef4496d7a64cdc89026dd328007615b6d6;hb=3eb76865c7fd23c300d8d60c42c74039532587c3;hp=ee977afb198de98468bb633ced7259dbb0667f3f;hpb=bbdea6e26c82a925377da981f42b27653621a5a7;p=mimedecode.git diff --git a/mimedecode.py b/mimedecode.py index ee977af..3f5879e 100755 --- a/mimedecode.py +++ b/mimedecode.py @@ -1,10 +1,13 @@ #! /usr/bin/env python """Decode MIME message""" -import sys, os +import os import subprocess +import sys + from mimedecode_version import __version__, \ __author__, __copyright__, __license__ + if sys.version_info[0] >= 3: # Replace email.message._formatparam with _formatparam from Python 2.7 # to avoid re-encoding non-ascii params. @@ -222,7 +225,8 @@ caps = None # Globally stored mailcap database; initialized only if needed def decode_body(msg, s): "Decode body to plain text using first copiousoutput filter from mailcap" - import mailcap, tempfile + import mailcap + import tempfile global caps if caps is None: @@ -342,10 +346,12 @@ def _save_message(msg, outstring, save_headers=False, save_body=False): global output save_output = output outfile = open_output_file(fname) + def _output_bytes(s): if not isinstance(s, bytes): s = s.encode(g.default_encoding, "replace") outfile.write(s) + output = _output_bytes if save_headers: output_headers(msg) @@ -566,6 +572,7 @@ class GlobalOptions: output_filename = None destination_dir = os.curdir + g = GlobalOptions