From: Zackery Spytz Date: Mon, 19 Jul 2021 16:07:54 +0000 (-0700) Subject: bpo-27513: email.utils.getaddresses() now handles Header objects (#13797) X-Git-Tag: v3.11.0a1~627 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89f4c34797de2f0e5045da2b97c1c8cbbb42fbb2;p=thirdparty%2FPython%2Fcpython.git bpo-27513: email.utils.getaddresses() now handles Header objects (#13797) getaddresses() should be able to handle a Header object if passed one. Co-authored-by: Łukasz Langa --- diff --git a/Lib/email/utils.py b/Lib/email/utils.py index a8e46a761bf9..cfdfeb3f1a86 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 eed60142b19e..0154bbad1f63 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)) ']) 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 ')]) + 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 000000000000..90d49bb2a993 --- /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.