spacefreak/pyquarantine-milter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

cleanup source

Browse Source
This commit is contained in:
Thomas Oettli
2020-06-09 19:47:47 +02:00
parent 5a59ab69b9
commit 2c1d5c17e0
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pymodmilter/actions.py
View File

@@ -284,8 +284,6 @@ def add_disclaimer(text, html, action, policy, milter, pretend=False,
logger.debug("parse message") logger.debug("parse message")
msg = fp.close() msg = fp.close()
text_content = None
html_content = None
update_headers = False update_headers = False
try: try:
@@ -321,8 +319,10 @@ def add_disclaimer(text, html, action, policy, milter, pretend=False,
data = _serialize_msg(msg, logger) data = _serialize_msg(msg, logger)
update_headers = True update_headers = True
except Exception as e: except Exception as e:
raise Exception("unable to wrap message in a new message envelope, " logger.error(e)
"give up ...") raise Exception(
"unable to wrap message in a new message envelope, "
"give up ...")
body_pos = data.find(b"\r\n\r\n") + 4 body_pos = data.find(b"\r\n\r\n") + 4
milter.fp.seek(0) milter.fp.seek(0)

1
pymodmilter/run.py
View File

@@ -105,7 +105,6 @@ def main():
if "global" not in config: if "global" not in config:
config["global"] = {} config["global"] = {}
if args.debug: if args.debug:
loglevel = logging.DEBUG loglevel = logging.DEBUG
else: else: