From 0600f750ef142dc1594bc489d17a43453a74ea80 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Wed, 21 Dec 2016 12:59:28 +0200 Subject: Issue #28992: Use bytes.fromhex(). --- Lib/email/_encoded_words.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Lib/email/_encoded_words.py') diff --git a/Lib/email/_encoded_words.py b/Lib/email/_encoded_words.py index 5eaab36ed0..32a1fa2648 100644 --- a/Lib/email/_encoded_words.py +++ b/Lib/email/_encoded_words.py @@ -62,7 +62,7 @@ __all__ = ['decode_q', # regex based decoder. _q_byte_subber = functools.partial(re.compile(br'=([a-fA-F0-9]{2})').sub, - lambda m: bytes([int(m.group(1), 16)])) + lambda m: bytes.fromhex(m.group(1))) def decode_q(encoded): encoded = encoded.replace(b'_', b' ') -- cgit v1.2.1 From 12c39518cd936289fedea63376d08a870aee594d Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Wed, 21 Dec 2016 14:08:55 +0200 Subject: Fixed a type error introduced in issue #28992. --- Lib/email/_encoded_words.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Lib/email/_encoded_words.py') diff --git a/Lib/email/_encoded_words.py b/Lib/email/_encoded_words.py index 32a1fa2648..c40ffa917b 100644 --- a/Lib/email/_encoded_words.py +++ b/Lib/email/_encoded_words.py @@ -62,7 +62,7 @@ __all__ = ['decode_q', # regex based decoder. _q_byte_subber = functools.partial(re.compile(br'=([a-fA-F0-9]{2})').sub, - lambda m: bytes.fromhex(m.group(1))) + lambda m: bytes.fromhex(m.group(1).decode())) def decode_q(encoded): encoded = encoded.replace(b'_', b' ') -- cgit v1.2.1