parseaddr(): Fixed in the same way that Message.getaddrlist() was

fixed (re: SF bug #555035).  Include a unittest.

diff --git a/Lib/rfc822.py b/Lib/rfc822.py
index 826269fe1a15790828d068aec6a39504618c619f..0ce546ced77417f5df33f5b7aa5afd21ae095725 100644 (file)
--- a/Lib/rfc822.py
+++ b/Lib/rfc822.py
@@ -495,7 +495,7 @@ def quote(str):
 def parseaddr(address):
     """Parse an address into a (realname, mailaddr) tuple."""
     a = AddressList(address)
-    list = a.getaddrlist()
+    list = a.addresslist
     if not list:
         return (None, None)
     else:

diff --git a/Lib/test/test_rfc822.py b/Lib/test/test_rfc822.py
index dfce7c915121f07cdede531bb61f1918160ae50b..6add15b16d40df0a3dc54d8f79c9e03c2bfae93a 100644 (file)
--- a/Lib/test/test_rfc822.py
+++ b/Lib/test/test_rfc822.py
@@ -213,6 +213,15 @@ A test message.
         addrs.sort()
         eq(addrs, ccs)
 
+    def test_parseaddr(self):
+        eq = self.assertEqual
+        eq(rfc822.parseaddr('<>'), ('', ''))
+        eq(rfc822.parseaddr('aperson@dom.ain'), ('', 'aperson@dom.ain'))
+        eq(rfc822.parseaddr('bperson@dom.ain (Bea A. Person)'),
+           ('Bea A. Person', 'bperson@dom.ain'))
+        eq(rfc822.parseaddr('Cynthia Person <cperson@dom.ain>'),
+           ('Cynthia Person', 'cperson@dom.ain'))
+
 def test_main():
     test_support.run_unittest(MessageTestCase)