comparison tests/test-import.t @ 37467:9bf65d1b43a6

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

37466:abd9f5ec1d82

  $ cat > mkmsg.py <<EOF
  > import email.message, sys
  > msg = email.message.Message()
  > patch = open(sys.argv[1], 'rb').read()
  > msg.set_payload('email commit message\n' + patch)
  > msg['Subject'] = 'email patch'
  > msg['From'] = 'email patcher'
  > open(sys.argv[2], 'wb').write(msg.as_string())
  > EOF


plain diff in email, subject, message body

  $ cat > mkmsg2.py <<EOF
  > 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['Subject'] = '[PATCH] email patch'
  > msg['From'] = 'email patcher'
  > open(sys.argv[2], 'wb').write(msg.as_string())
  > EOF


plain diff in email, [PATCH] subject, message body with subject

37467:9bf65d1b43a6

  $ cat > mkmsg.py <<EOF
  > import email.message, sys
  > msg = email.message.Message()
  > patch = open(sys.argv[1], 'rb').read()
  > msg.set_payload(b'email commit message\n' + patch)
  > msg['Subject'] = 'email patch'
  > msg['From'] = 'email patcher'
  > open(sys.argv[2], 'wb').write(bytes(msg))
  > EOF


plain diff in email, subject, message body

  $ cat > mkmsg2.py <<EOF
  > import email.message, sys
  > msg = email.message.Message()
  > patch = open(sys.argv[1], 'rb').read()
  > 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(bytes(msg))
  > EOF


plain diff in email, [PATCH] subject, message body with subject