bpo-30681: Change error handling to return None in case of invalid date

timb07 · timb07 · commit 2bf3127e2e95 · 2017-06-17T11:18:22.000+10:00
diff --git a/Lib/email/utils.py b/Lib/email/utils.py
@@ -207,11 +207,19 @@ def make_msgid(idstring=None, domain=None):
 
 
 def parsedate_to_datetime(data):
-    *dtuple, tz = _parsedate_tz(data)
-    if tz is None:
-        return datetime.datetime(*dtuple[:6])
-    return datetime.datetime(*dtuple[:6],
-            tzinfo=datetime.timezone(datetime.timedelta(seconds=tz)))
+    try:
+        *dtuple, tz = _parsedate_tz(data)
+    except TypeError:
+        # _parsedate_tz(data) returned None due to failure to parse
+        return None
+    try:
+        if tz is None:
+            return datetime.datetime(*dtuple[:6])
+        return datetime.datetime(*dtuple[:6],
+                tzinfo=datetime.timezone(datetime.timedelta(seconds=tz)))
+    except ValueError:
+        # Date parsed ok, but one or more component values are invalid
+        return None
 
 
 def parseaddr(addr):
diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py
@@ -48,6 +48,16 @@ def test_parsedate_to_datetime_naive(self):
             utils.parsedate_to_datetime(self.datestring + ' -0000'),
             self.naive_dt)
 
+    def test_parsedate_to_datetime_invalid_string(self):
+        self.assertIsNone(
+            utils.parsedate_to_datetime('')
+        )
+
+    def test_parsedate_to_datetime_invalid_date(self):
+        self.assertIsNone(
+            utils.parsedate_to_datetime('Tue, 06 Jun 2017 27:39:33 +0600')
+        )
+
 
 class LocaltimeTests(unittest.TestCase):
 
