1
0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-17 14:37:02 +00:00

test: Remove dependency on Python 2

Python 2 is approaching end of life, and we only need it to run
the mail_diff test utility.

This patch updates mail_diff to run on Python 3, which only needed minor
changes.
This commit is contained in:
Alberto Bertogli
2019-08-30 09:46:46 +01:00
parent e98464c424
commit 0f487e5fb5
4 changed files with 6 additions and 6 deletions

View File

@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
import difflib
import email.parser
@@ -71,7 +71,7 @@ def msg_equals(expected, msg):
return False
if expected.is_multipart():
for exp, got in itertools.izip_longest(expected.get_payload(), msg.get_payload()):
for exp, got in itertools.zip_longest(expected.get_payload(), msg.get_payload()):
if not msg_equals(exp, got):
return False
else:
@@ -90,8 +90,6 @@ if __name__ == "__main__":
f1, f2 = sys.argv[1:3]
expected = email.parser.Parser().parse(open(f1))
mbox = mailbox.mbox(f2, create=False)
msg = mbox[0]
msg = email.parser.Parser().parse(open(f2))
sys.exit(0 if msg_equals(expected, msg) else 1)