summaryrefslogtreecommitdiffstats
path: root/Lib/email
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-07-06 15:17:45 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-07-06 15:17:45 (GMT)
commite0a39de647902d836e2acf680d8cfc5caa21460f (patch)
treeb10974509dd87344426e8705042542a984bcb2fd /Lib/email
parentc2464bf5c664d859aa3367b08f0504a1dddffa0d (diff)
parent2a99d5df63395149ef7393ef5e8a4fb141f64b55 (diff)
downloadcpython-e0a39de647902d836e2acf680d8cfc5caa21460f.zip
cpython-e0a39de647902d836e2acf680d8cfc5caa21460f.tar.gz
cpython-e0a39de647902d836e2acf680d8cfc5caa21460f.tar.bz2
#18380: merge with 3.3.
Diffstat (limited to 'Lib/email')
-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 78638d5..bc02281 100644
--- a/Lib/email/quoprimime.py
+++ b/Lib/email/quoprimime.py
@@ -319,4 +319,4 @@ def header_decode(s):
the high level email.header class for that functionality.
"""
s = s.replace('_', ' ')
- return re.sub(r'=[a-fA-F0-9]{2}', _unquote_match, s, re.ASCII)
+ return re.sub(r'=[a-fA-F0-9]{2}', _unquote_match, s, flags=re.ASCII)