summaryrefslogtreecommitdiffstats
path: root/Lib/email/_parseaddr.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-09-22 07:03:56 (GMT)
committerGeorg Brandl <georg@python.org>2012-09-22 07:03:56 (GMT)
commit1aca31e8f329e19de62a2f1a2080995e5712a9cd (patch)
tree9a3d62178053892e1bb1033032f88977746a7951 /Lib/email/_parseaddr.py
parentdeb92b5b1b015191bb9f072b67536e471bd37a7a (diff)
downloadcpython-1aca31e8f329e19de62a2f1a2080995e5712a9cd.zip
cpython-1aca31e8f329e19de62a2f1a2080995e5712a9cd.tar.gz
cpython-1aca31e8f329e19de62a2f1a2080995e5712a9cd.tar.bz2
Closes #15925: fix regression in parsedate() and parsedate_tz() that should return None if unable to parse the argument.
Diffstat (limited to 'Lib/email/_parseaddr.py')
-rw-r--r--Lib/email/_parseaddr.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py
index 3528d02..cdfa372 100644
--- a/Lib/email/_parseaddr.py
+++ b/Lib/email/_parseaddr.py
@@ -48,6 +48,8 @@ def parsedate_tz(data):
Accounts for military timezones.
"""
res = _parsedate_tz(data)
+ if not res:
+ return
if res[9] is None:
res[9] = 0
return tuple(res)
@@ -62,6 +64,8 @@ def _parsedate_tz(data):
source timezone really was UTC.
"""
+ if not data:
+ return
data = data.split()
# The FWS after the comma after the day-of-week is optional, so search and
# adjust for this.