comparison tests/test-patchbomb.t @ 43325:7d4f2e4899c5 stable

py3: fix headencode() with display=False

We previously called str() on a email.header.Header object. On Python 2,
this returns a bytestring and the __str__ method is actually an alias to
.encode() method. On Python 3, __str__ does not perform encoding (and
returns a unicode string). To keep a consistent behavior across Python
versions, we explicitly use .encode() and we wrap the result with
encoding.strtolocal() to get a bytestring in all cases. As a side effect
of forcing bytes conversion, we need to decode back in _addressencode().

This is to make test-notify.t pass on Python 3.

Also note that headers are now encoded in some patchbomb tests; this is
because the charset is not always "us-ascii" ("iso-8859-1" otherwise) on
Python 3.

43324:866bd2cf764b

  X-Mercurial-Series-Total: 1
  Message-Id: <909a00e13e9d78b575ae.240@test-hostname>
  X-Mercurial-Series-Id: <909a00e13e9d78b575ae.240@test-hostname>
  User-Agent: Mercurial-patchbomb/* (glob)
  Date: Thu, 01 Jan 1970 00:04:00 +0000
  From: Q <quux>
  To: foo
  Cc: bar
  
  IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHRlc3QKIyBEYXRlIDQgMAojICAgICAgVGh1IEph
  biAwMSAwMDowMDowNCAxOTcwICswMDAwCiMgTm9kZSBJRCA5MDlhMDBlMTNlOWQ3OGI1NzVhZWVl

  Message-Id: <8580ff50825a50c8f716.315532860@test-hostname>
  X-Mercurial-Series-Id: <8580ff50825a50c8f716.315532860@test-hostname>
  User-Agent: Mercurial-patchbomb/* (glob)
  Date: Tue, 01 Jan 1980 00:01:00 +0000
  From: quux
  To: spam <spam>, eggs, toast
  Cc: foo, [e-mail], "A, B <>" <[e-mail]>
  Bcc: "Quux, A." <quux>
  
  # HG changeset patch
  # User test
  # Date 1 0
  #      Thu Jan 01 00:00:01 1970 +0000

43325:7d4f2e4899c5

  X-Mercurial-Series-Total: 1
  Message-Id: <909a00e13e9d78b575ae.240@test-hostname>
  X-Mercurial-Series-Id: <909a00e13e9d78b575ae.240@test-hostname>
  User-Agent: Mercurial-patchbomb/* (glob)
  Date: Thu, 01 Jan 1970 00:04:00 +0000
  From: Q <quux> (no-py3 !)
  From: =?iso-8859-1?q?Q?= <quux> (py3 !)
  To: foo
  Cc: bar
  
  IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHRlc3QKIyBEYXRlIDQgMAojICAgICAgVGh1IEph
  biAwMSAwMDowMDowNCAxOTcwICswMDAwCiMgTm9kZSBJRCA5MDlhMDBlMTNlOWQ3OGI1NzVhZWVl

  Message-Id: <8580ff50825a50c8f716.315532860@test-hostname>
  X-Mercurial-Series-Id: <8580ff50825a50c8f716.315532860@test-hostname>
  User-Agent: Mercurial-patchbomb/* (glob)
  Date: Tue, 01 Jan 1980 00:01:00 +0000
  From: quux
  To: spam <spam>, eggs, toast (no-py3 !)
  Cc: foo, [e-mail], "A, B <>" <[e-mail]> (no-py3 !)
  Bcc: "Quux, A." <quux> (no-py3 !)
  To: =?iso-8859-1?q?spam?= <spam>, eggs, toast (py3 !)
  Cc: foo, [e-mail], =?iso-8859-1?q?A=2C_B_=3C=3E?= <[e-mail]> (py3 !)
  Bcc: =?iso-8859-1?q?Quux=2C_A=2E?= <quux> (py3 !)
  
  # HG changeset patch
  # User test
  # Date 1 0
  #      Thu Jan 01 00:00:01 1970 +0000