py3: fix string issues of email message in test-import.t
- payload can be bytes
- headers must be unicode on Python 3
- need to call msg.as_bytes() on Python 3, but msg.as_string() on Python 2,
where bytes(msg) magic works
--- a/tests/test-import.t Sun Apr 08 14:46:24 2018 +0900
+++ b/tests/test-import.t Sun Apr 08 14:59:12 2018 +0900
@@ -288,10 +288,10 @@
> import email.message, sys
> msg = email.message.Message()
> patch = open(sys.argv[1], 'rb').read()
- > msg.set_payload('email commit message\n' + patch)
+ > msg.set_payload(b'email commit message\n' + patch)
> msg['Subject'] = 'email patch'
> msg['From'] = 'email patcher'
- > open(sys.argv[2], 'wb').write(msg.as_string())
+ > open(sys.argv[2], 'wb').write(bytes(msg))
> EOF
@@ -386,10 +386,10 @@
> import email.message, sys
> msg = email.message.Message()
> patch = open(sys.argv[1], 'rb').read()
- > msg.set_payload('email patch\n\nnext line\n---\n' + patch)
+ > msg.set_payload(b'email patch\n\nnext line\n---\n' + patch)
> msg['Subject'] = '[PATCH] email patch'
> msg['From'] = 'email patcher'
- > open(sys.argv[2], 'wb').write(msg.as_string())
+ > open(sys.argv[2], 'wb').write(bytes(msg))
> EOF