mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
parseaddr(): Don't use rfc822.parseaddr() because this now implies a
double call to AddressList.getaddrlist(), and /that/ always returns an empty list for the second and subsequent calls. Instead, instantiate an AddressList directly, and get the parsed addresses out of the addresslist attribute.
This commit is contained in:
parent
0e0b6180ba
commit
24fd0252c4
1 changed files with 3 additions and 4 deletions
|
@ -20,7 +20,6 @@ from rfc822 import mktime_tz
|
|||
# We need wormarounds for bugs in these methods in older Pythons (see below)
|
||||
from rfc822 import parsedate as _parsedate
|
||||
from rfc822 import parsedate_tz as _parsedate_tz
|
||||
from rfc822 import parseaddr as _parseaddr
|
||||
|
||||
from quopri import decodestring as _qdecode
|
||||
import base64
|
||||
|
@ -237,7 +236,7 @@ def parsedate_tz(data):
|
|||
|
||||
|
||||
def parseaddr(addr):
|
||||
realname, emailaddr = _parseaddr(addr)
|
||||
if realname == '' and emailaddr is None:
|
||||
addrs = _AddressList(addr).addresslist
|
||||
if not addrs:
|
||||
return '', ''
|
||||
return realname, emailaddr
|
||||
return addrs[0]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue