Mercurial > hg
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.
author | Denis Laxalde <denis.laxalde@logilab.fr> |
---|---|
date | Thu, 24 Oct 2019 17:16:43 +0200 |
parents | 2cc453284d5c |
children | 08189f3acbc6 |
comparison
equal
deleted
inserted
replaced
43324:866bd2cf764b | 43325:7d4f2e4899c5 |
---|---|
510 X-Mercurial-Series-Total: 1 | 510 X-Mercurial-Series-Total: 1 |
511 Message-Id: <909a00e13e9d78b575ae.240@test-hostname> | 511 Message-Id: <909a00e13e9d78b575ae.240@test-hostname> |
512 X-Mercurial-Series-Id: <909a00e13e9d78b575ae.240@test-hostname> | 512 X-Mercurial-Series-Id: <909a00e13e9d78b575ae.240@test-hostname> |
513 User-Agent: Mercurial-patchbomb/* (glob) | 513 User-Agent: Mercurial-patchbomb/* (glob) |
514 Date: Thu, 01 Jan 1970 00:04:00 +0000 | 514 Date: Thu, 01 Jan 1970 00:04:00 +0000 |
515 From: Q <quux> | 515 From: Q <quux> (no-py3 !) |
516 From: =?iso-8859-1?q?Q?= <quux> (py3 !) | |
516 To: foo | 517 To: foo |
517 Cc: bar | 518 Cc: bar |
518 | 519 |
519 IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHRlc3QKIyBEYXRlIDQgMAojICAgICAgVGh1IEph | 520 IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHRlc3QKIyBEYXRlIDQgMAojICAgICAgVGh1IEph |
520 biAwMSAwMDowMDowNCAxOTcwICswMDAwCiMgTm9kZSBJRCA5MDlhMDBlMTNlOWQ3OGI1NzVhZWVl | 521 biAwMSAwMDowMDowNCAxOTcwICswMDAwCiMgTm9kZSBJRCA5MDlhMDBlMTNlOWQ3OGI1NzVhZWVl |
2395 Message-Id: <8580ff50825a50c8f716.315532860@test-hostname> | 2396 Message-Id: <8580ff50825a50c8f716.315532860@test-hostname> |
2396 X-Mercurial-Series-Id: <8580ff50825a50c8f716.315532860@test-hostname> | 2397 X-Mercurial-Series-Id: <8580ff50825a50c8f716.315532860@test-hostname> |
2397 User-Agent: Mercurial-patchbomb/* (glob) | 2398 User-Agent: Mercurial-patchbomb/* (glob) |
2398 Date: Tue, 01 Jan 1980 00:01:00 +0000 | 2399 Date: Tue, 01 Jan 1980 00:01:00 +0000 |
2399 From: quux | 2400 From: quux |
2400 To: spam <spam>, eggs, toast | 2401 To: spam <spam>, eggs, toast (no-py3 !) |
2401 Cc: foo, bar@example.com, "A, B <>" <a@example.com> | 2402 Cc: foo, bar@example.com, "A, B <>" <a@example.com> (no-py3 !) |
2402 Bcc: "Quux, A." <quux> | 2403 Bcc: "Quux, A." <quux> (no-py3 !) |
2404 To: =?iso-8859-1?q?spam?= <spam>, eggs, toast (py3 !) | |
2405 Cc: foo, bar@example.com, =?iso-8859-1?q?A=2C_B_=3C=3E?= <a@example.com> (py3 !) | |
2406 Bcc: =?iso-8859-1?q?Quux=2C_A=2E?= <quux> (py3 !) | |
2403 | 2407 |
2404 # HG changeset patch | 2408 # HG changeset patch |
2405 # User test | 2409 # User test |
2406 # Date 1 0 | 2410 # Date 1 0 |
2407 # Thu Jan 01 00:00:01 1970 +0000 | 2411 # Thu Jan 01 00:00:01 1970 +0000 |