summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-07-19 17:28:56 (GMT)
committerGitHub <noreply@github.com>2021-07-19 17:28:56 (GMT)
commit9ee12cf325d4da2c07919e5e56545feb7e005e08 (patch)
tree2d1c05518dcc836744928d368e4e529a3022ebb8 /Lib
parent2f643b1a8cd53f3c2f49f931bc98990a3b400495 (diff)
downloadcpython-9ee12cf325d4da2c07919e5e56545feb7e005e08.zip
cpython-9ee12cf325d4da2c07919e5e56545feb7e005e08.tar.gz
cpython-9ee12cf325d4da2c07919e5e56545feb7e005e08.tar.bz2
bpo-27513: email.utils.getaddresses() now handles Header objects (GH-13797) (#27245)
getaddresses() should be able to handle a Header object if passed one. Co-authored-by: Ɓukasz Langa <lukasz@langa.pl> (cherry picked from commit 89f4c34797de2f0e5045da2b97c1c8cbbb42fbb2) Co-authored-by: Zackery Spytz <zspytz@gmail.com>
Diffstat (limited to 'Lib')
-rw-r--r--Lib/email/utils.py2
-rw-r--r--Lib/test/test_email/test_email.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/Lib/email/utils.py b/Lib/email/utils.py
index 1a7719d..48d3016 100644
--- a/Lib/email/utils.py
+++ b/Lib/email/utils.py
@@ -109,7 +109,7 @@ def formataddr(pair, charset='utf-8'):
def getaddresses(fieldvalues):
"""Return a list of (REALNAME, EMAIL) for each fieldvalue."""
- all = COMMASPACE.join(fieldvalues)
+ all = COMMASPACE.join(str(v) for v in fieldvalues)
a = _AddressList(all)
return a.addresslist
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index ab68cdd..0421055 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -3262,6 +3262,11 @@ Foo
addrs = utils.getaddresses(['User ((nested comment)) <foo@bar.com>'])
eq(addrs[0][1], 'foo@bar.com')
+ def test_getaddresses_header_obj(self):
+ """Test the handling of a Header object."""
+ addrs = utils.getaddresses([Header('Al Person <aperson@dom.ain>')])
+ self.assertEqual(addrs[0][1], 'aperson@dom.ain')
+
def test_make_msgid_collisions(self):
# Test make_msgid uniqueness, even with multiple threads
class MsgidsThread(Thread):