summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-07-19 16:54:45 (GMT)
committerGitHub <noreply@github.com>2021-07-19 16:54:45 (GMT)
commit8c43bf1a923754fa6d97772151c6ac23c48759d3 (patch)
tree2b735fcf283a48f20d543e1b5989d92ccdaa0d1d
parent2d0492091e3fce73230b2e88949210c9f1eb194b (diff)
downloadcpython-8c43bf1a923754fa6d97772151c6ac23c48759d3.zip
cpython-8c43bf1a923754fa6d97772151c6ac23c48759d3.tar.gz
cpython-8c43bf1a923754fa6d97772151c6ac23c48759d3.tar.bz2
bpo-27513: email.utils.getaddresses() now handles Header objects (GH-13797) (GH-27242)
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>
-rw-r--r--Lib/email/utils.py2
-rw-r--r--Lib/test/test_email/test_email.py5
-rw-r--r--Misc/NEWS.d/next/Library/2019-06-03-23-53-25.bpo-27513.qITN7d.rst3
3 files changed, 9 insertions, 1 deletions
diff --git a/Lib/email/utils.py b/Lib/email/utils.py
index a8e46a7..cfdfeb3 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 eed6014..0154bba 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -3263,6 +3263,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):
diff --git a/Misc/NEWS.d/next/Library/2019-06-03-23-53-25.bpo-27513.qITN7d.rst b/Misc/NEWS.d/next/Library/2019-06-03-23-53-25.bpo-27513.qITN7d.rst
new file mode 100644
index 0000000..90d49bb
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-06-03-23-53-25.bpo-27513.qITN7d.rst
@@ -0,0 +1,3 @@
+:func:`email.utils.getaddresses` now accepts
+:class:`email.header.Header` objects along with string values.
+Patch by Zackery Spytz.