summaryrefslogtreecommitdiff
path: root/Lib/email/_encoded_words.py
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2017-01-29 10:16:28 +0000
committerMartin Panter <vadmium+py@gmail.com>2017-01-29 10:16:28 +0000
commit23352add84278fc0476b2d6599489fbb70c9f5bc (patch)
tree600bf5132e46d31b69efbd3bbc8a3d37159c0744 /Lib/email/_encoded_words.py
parent6d1d733828b49eb03d45da81c6b8c6b849fbc5df (diff)
parent0fb1e3c9fc84c62a91f1e5889dc8e0855cefa4ae (diff)
downloadcpython-23352add84278fc0476b2d6599489fbb70c9f5bc.tar.gz
Issues #29349: Merge Py 2 fix 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' ')