getaddresses(): Like the change in rfc822.py, this one needs to access

warsaw · warsaw · commit 4be9eccbc404 · 2002-05-22T01:52:10.000Z
the AddressList.addresslist attribute directly.

Also, add a test case for the email.Utils.getaddresses() interface.
diff --git a/Lib/email/Utils.py b/Lib/email/Utils.py
@@ -113,7 +113,7 @@ def getaddresses(fieldvalues):
     """Return a list of (REALNAME, EMAIL) for each fieldvalue."""
     all = COMMASPACE.join(fieldvalues)
     a = _AddressList(all)
-    return a.getaddrlist()
+    return a.addresslist
 
 
 
diff --git a/Lib/test/test_email.py b/Lib/test/test_email.py
@@ -1235,6 +1235,13 @@ def test_charset_richcomparisons(self):
         eq(cset1, cset2)
         eq(cset2, cset1)
 
+    def test_getaddresses(self):
+        eq = self.assertEqual
+        eq(Utils.getaddresses(['aperson@dom.ain (Al Person)',
+                               'Bud Person <bperson@dom.ain>']),
+           [('Al Person', 'aperson@dom.ain'),
+            ('Bud Person', 'bperson@dom.ain')])
+
 
 
 # Test the iterator/generators

-Original file line number
+Diff line change
         eq(cset1, cset2)
         eq(cset2, cset1)
 +    def test_getaddresses(self):
 +        eq = self.assertEqual
 +        eq(Utils.getaddresses(['[email protected] (Al Person)',
 +                               'Bud Person <[email protected]>']),
 +           [('Al Person', '[email protected]'),
 +            ('Bud Person', '[email protected]')])
++
 # Test the iterator/generators