From b9e687618d3489944f29adbd2be50b46940c9e70 Mon Sep 17 00:00:00 2001 From: Ben Hoyt Date: Thu, 14 Oct 2021 05:21:27 +1300 Subject: [PATCH] bpo-45239: Fix parsedate_tz when time has more than 2 dots in it (GH-28452) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Łukasz Langa --- Lib/email/_parseaddr.py | 2 ++ Lib/test/test_email/test_email.py | 1 + .../next/Library/2021-10-13-17-52-48.bpo-45239.7li1_0.rst | 3 +++ 3 files changed, 6 insertions(+) create mode 100644 Misc/NEWS.d/next/Library/2021-10-13-17-52-48.bpo-45239.7li1_0.rst diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py index 977fedf67b1..ba5ad5a36d0 100644 --- a/Lib/email/_parseaddr.py +++ b/Lib/email/_parseaddr.py @@ -128,6 +128,8 @@ def _parsedate_tz(data): tss = 0 elif len(tm) == 3: [thh, tmm, tss] = tm + else: + return None else: return None try: diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py index 4001f716471..54ffcdc544e 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -3009,6 +3009,7 @@ class TestMiscellaneous(TestEmailBase): self.assertIsNone(utils.parsedate_tz('0')) self.assertIsNone(utils.parsedate('A Complete Waste of Time')) self.assertIsNone(utils.parsedate_tz('A Complete Waste of Time')) + self.assertIsNone(utils.parsedate_tz('Wed, 3 Apr 2002 12.34.56.78+0800')) # Not a part of the spec but, but this has historically worked: self.assertIsNone(utils.parsedate(None)) self.assertIsNone(utils.parsedate_tz(None)) diff --git a/Misc/NEWS.d/next/Library/2021-10-13-17-52-48.bpo-45239.7li1_0.rst b/Misc/NEWS.d/next/Library/2021-10-13-17-52-48.bpo-45239.7li1_0.rst new file mode 100644 index 00000000000..9e5ec561c36 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-10-13-17-52-48.bpo-45239.7li1_0.rst @@ -0,0 +1,3 @@ +Fixed :func:`email.utils.parsedate_tz` crashing with +:exc:`UnboundLocalError` on certain invalid input instead of returning +``None``. Patch by Ben Hoyt.