altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Changed our parseaddr() and formataddr() to work correctly with python3.

Browse source 
- Legacy-Id: 16399
This commit is contained in:
Henrik Levkowetz 2019-07-04 21:00:48 +00:00
parent a3d40ace9b
commit 3a35dfcee4
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ietf/utils/mail.py
View file

@ -217,10 +217,7 @@ def formataddr(addrtuple):
address field. Does what's needed, and returns a string value suitable for
use in a To: or Cc: email header field.
"""
name, addr = addrtuple
if name and not isascii(name):
name = str(Header(name, 'utf-8'))
return simple_formataddr((name, addr))
return simple_formataddr(addrtuple, charset='utf-8')
def parseaddr(addr):
"""
@ -230,7 +227,8 @@ def parseaddr(addr):
which case a 2-tuple of ('', '') is returned.
"""
addr = ''.join( [ s.decode(m) if m else str(s) for (s,m) in decode_header(addr) ] )
if not isinstance(addr, str):
addr = ''.join( [ s.decode(m) if m else s.decode() for (s,m) in decode_header(addr) ] )
name, addr = simple_parseaddr(addr)
return name, addr