summaryrefslogtreecommitdiff
path: root/Lib/email/_encoded_words.py
diff options
context:
space:
mode:
authordoko <doko@ubuntu.com>2017-01-31 13:35:56 +0100
committerdoko <doko@ubuntu.com>2017-01-31 13:35:56 +0100
commitb23072b8814146d3a76eb752fd7526eb1575e7cc (patch)
treecf13a75e5570561a10bf68c2c451e9271229a3be /Lib/email/_encoded_words.py
parente0cb38ac4330d5e09b5e21c74c5d5e453af99a4f (diff)
parentccd19e48ec9d557231bf923c338be0e7509a51d3 (diff)
downloadcpython-b23072b8814146d3a76eb752fd7526eb1575e7cc.tar.gz
merge 3.6
Diffstat (limited to 'Lib/email/_encoded_words.py')
-rw-r--r--Lib/email/_encoded_words.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/email/_encoded_words.py b/Lib/email/_encoded_words.py
index 5eaab36ed0..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([int(m.group(1), 16)]))
+ lambda m: bytes.fromhex(m.group(1).decode()))
def decode_q(encoded):
encoded = encoded.replace(b'_', b' ')