diff options
| -rw-r--r-- | Lib/email/header.py | 4 | ||||
| -rw-r--r-- | Lib/email/utils.py | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/Lib/email/header.py b/Lib/email/header.py index c7b2dd9..7b30a03 100644 --- a/Lib/email/header.py +++ b/Lib/email/header.py @@ -36,11 +36,11 @@ ecre = re.compile(r''' =\? # literal =? (?P<charset>[^?]*?) # non-greedy up to the next ? is the charset \? # literal ? - (?P<encoding>[qb]) # either a "q" or a "b", case insensitive + (?P<encoding>[qQbB]) # either a "q" or a "b", case insensitive \? # literal ? (?P<encoded>.*?) # non-greedy up to the next ?= is the encoded string \?= # literal ?= - ''', re.VERBOSE | re.IGNORECASE | re.MULTILINE) + ''', re.VERBOSE | re.MULTILINE) # Field name regexp, including trailing colon, but not separating whitespace, # according to RFC 2822. Character range is from tilde to exclamation mark. diff --git a/Lib/email/utils.py b/Lib/email/utils.py index 39c2240..858f620 100644 --- a/Lib/email/utils.py +++ b/Lib/email/utils.py @@ -114,18 +114,6 @@ def getaddresses(fieldvalues): return a.addresslist - -ecre = re.compile(r''' - =\? # literal =? - (?P<charset>[^?]*?) # non-greedy up to the next ? is the charset - \? # literal ? - (?P<encoding>[qb]) # either a "q" or a "b", case insensitive - \? # literal ? - (?P<atom>.*?) # non-greedy up to the next ?= is the atom - \?= # literal ?= - ''', re.VERBOSE | re.IGNORECASE) - - def _format_timetuple_and_zone(timetuple, zone): return '%s, %02d %s %04d %02d:%02d:%02d %s' % ( ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'][timetuple[6]], |