Refined our parseaddr() to deal correctly with both bytes and str

levkowetz · levkowetz · commit 472a3ed03951 · 2019-07-07T13:03:11.000Z
- Legacy-Id: 16419
diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
@@ -227,8 +227,8 @@ def parseaddr(addr):
     which case a 2-tuple of ('', '') is returned.
 
     """
-    if not isinstance(addr, str):
-        addr = ''.join( [ s.decode(m) if m else s.decode() for (s,m) in decode_header(addr) ] )
+
+    addr = ''.join( [ ( s.decode(m) if m else s.decode()) if isinstance(s, bytes) else s for (s,m) in decode_header(addr) ] )
     name, addr = simple_parseaddr(addr)
     return name, addr
 
