diff options
| author | Barry Warsaw | 2015-01-04 20:20:33 -0500 |
|---|---|---|
| committer | Barry Warsaw | 2015-01-04 20:20:33 -0500 |
| commit | 4a612db8e89afed74173b93f3b64fa567b8417a3 (patch) | |
| tree | 81a687d113079a25f93279f35c7eee2aa2572510 /src/mailman/utilities/email.py | |
| parent | 84af79988a4e916604cba31843778206efb7d1b8 (diff) | |
| parent | de181c1a40965a3a7deedd56a034a946f45b6984 (diff) | |
| download | mailman-4a612db8e89afed74173b93f3b64fa567b8417a3.tar.gz mailman-4a612db8e89afed74173b93f3b64fa567b8417a3.tar.zst mailman-4a612db8e89afed74173b93f3b64fa567b8417a3.zip | |
Diffstat (limited to 'src/mailman/utilities/email.py')
| -rw-r--r-- | src/mailman/utilities/email.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mailman/utilities/email.py b/src/mailman/utilities/email.py index ea44ad0a4..bedbd2ae9 100644 --- a/src/mailman/utilities/email.py +++ b/src/mailman/utilities/email.py @@ -17,9 +17,6 @@ """Email helpers.""" -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type __all__ = [ 'add_message_hash', 'split_email', @@ -70,7 +67,10 @@ def add_message_hash(msg): message_id = message_id[1:-1] else: message_id = message_id.strip() - digest = sha1(message_id).digest() + # Because .digest() returns bytes, b32encode() will return bytes, however + # we need a string for the header value. We know the b32encoded byte + # string must be ascii-only. + digest = sha1(message_id.encode('utf-8')).digest() message_id_hash = b32encode(digest) del msg['x-message-id-hash'] - msg['X-Message-ID-Hash'] = message_id_hash + msg['X-Message-ID-Hash'] = message_id_hash.decode('ascii') |