X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=9019669f150b3ed39c84eeb4f55906e6d3b1e8be;hb=b1853fe16abc5f255bb9cce7ce36d68dfb5e4e1a;hp=caa85330a442ddf8364d427dea724695a8426cf7;hpb=b819801a0793774cca68356feb87e14bd7c16092;p=mimedecode.git diff --git a/mimedecode.py b/mimedecode.py index caa8533..9019669 100755 --- a/mimedecode.py +++ b/mimedecode.py @@ -5,13 +5,12 @@ import os import subprocess import sys -from mimedecode_version import __version__, \ - __author__, __copyright__, __license__ +from mimedecode_version import __version__, __copyright__ if sys.version_info[0] >= 3: # Replace email.message._formatparam with _formatparam from Python 2.7 # to avoid re-encoding non-ascii params. - import formatparam_27 + import formatparam_27 # noqa: F401: Imported for its side effect me = os.path.basename(sys.argv[0]) @@ -20,7 +19,8 @@ def version(exit=1): sys.stdout.write("""\ Broytman mimedecode.py version %s, %s """ % (__version__, __copyright__)) - if exit: sys.exit(0) + if exit: + sys.exit(0) def usage(code=0, errormsg=''): @@ -356,7 +356,8 @@ def _save_message(msg, outstring, save_headers=False, save_body=False): fname = str(g.save_counter) + fname if '.' not in fname: ext = _guess_extension(msg.get_content_type()) - if ext: fname += ext + if ext: + fname += ext global output save_output = output @@ -545,7 +546,7 @@ def open_output_file(filename): os.makedirs(full_dir) try: return open(fullpath, 'wb') - except: + except Exception: if create: os.removedirs(full_dir)