Skip to content

bpo-30681: Support invalid date format or value #2254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
timb07 wants to merge 6 commits into from
Closed

bpo-30681: Support invalid date format or value #2254

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2bf3127
bpo-30681: Change error handling to return None in case of invalid date
timb07 Jun 17, 2017
e0b616a
bpo-30681: Handle invalid date in Date header
timb07 Jun 17, 2017
c59e0bf
bpo-30681: Add InvalidDateDefect
timb07 Jun 17, 2017
5c6cfaf
Revert "bpo-30681: Change error handling to return None in case of in…
timb07 Jun 17, 2017
8c8ac38
bpo-30681: Handle invalid date in Date header
timb07 Nov 28, 2018
96f8223
bpo-30681: Document failure modes of parsedate_to_datetime and add tests
timb07 Nov 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
bpo-30681: Change error handling to return None in case of invalid date
  • Loading branch information
@timb07
timb07 committed Jun 17, 2017
commit 2bf3127e2e950e40e40046331a569a503e74d8a1
18 changes: 13 additions & 5 deletions Lib/email/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
10 changes: 10 additions & 0 deletions Lib/test/test_email/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):

Expand Down