summaryrefslogtreecommitdiffstats
path: root/Lib/email/quoprimime.py
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-10-01 15:45:48 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-10-01 15:45:48 (GMT)
commitf9c957f2c6d1fb59d1817a24892b1e792fa0c66c (patch)
treeddd15be2793e78b2cb29edd394d36051fb95751b /Lib/email/quoprimime.py
parenteccd4d910dc61d5ad8ccc9c62d3ab823b359aa9d (diff)
downloadcpython-f9c957f2c6d1fb59d1817a24892b1e792fa0c66c.zip
cpython-f9c957f2c6d1fb59d1817a24892b1e792fa0c66c.tar.gz
cpython-f9c957f2c6d1fb59d1817a24892b1e792fa0c66c.tar.bz2
Merged revisions 85142 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85142 | r.david.murray | 2010-10-01 11:40:20 -0400 (Fri, 01 Oct 2010) | 5 lines #10004: in Q encoded word ignore '=xx' when xx is not valid hex. Bug report and fix by Thomas Guettler. ........
Diffstat (limited to 'Lib/email/quoprimime.py')
-rw-r--r--Lib/email/quoprimime.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/email/quoprimime.py b/Lib/email/quoprimime.py
index bf28d39..85efc08 100644
--- a/Lib/email/quoprimime.py
+++ b/Lib/email/quoprimime.py
@@ -294,4 +294,4 @@ def header_decode(s):
the high level email.Header class for that functionality.
"""
s = s.replace('_', ' ')
- return re.sub(r'=\w{2}', _unquote_match, s, re.ASCII)
+ return re.sub(r'=[a-fA-F0-9]{2}', _unquote_match, s, re.ASCII)