diff options
| author | Georges Toth <georges@trypill.org> | 2020-10-27 00:31:06 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-27 00:31:06 (GMT) |
| commit | 303aac8c56609290e122eecc14c038e9b1e4174a (patch) | |
| tree | 625fa73aa444a2c2ec59ec1bfebbc33108eafc82 /Lib/test/test_email/test_utils.py | |
| parent | 8e3b9f92835654943bb59d9658bb52e1b0f40a22 (diff) | |
| download | cpython-303aac8c56609290e122eecc14c038e9b1e4174a.zip cpython-303aac8c56609290e122eecc14c038e9b1e4174a.tar.gz cpython-303aac8c56609290e122eecc14c038e9b1e4174a.tar.bz2 | |
bpo-30681: Support invalid date format or value in email Date header (GH-22090)
I am re-submitting an older PR which was abandoned but is still relevant, #10783 by @timb07.
The issue being solved () is still relevant. The original PR #10783 was closed as
the final request changes were not applied and since abandoned.
In this new PR I have re-used the original patch plus applied both comments from the review, by @maxking and @pganssle.
For reference, here is the original PR description:
In email.utils.parsedate_to_datetime(), a failure to parse the date, or invalid date components (such as hour outside 0..23) raises an exception. Document this behaviour, and add tests to test_email/test_utils.py to confirm this behaviour.
In email.headerregistry.DateHeader.parse(), check when parsedate_to_datetime() raises an exception and add a new defect InvalidDateDefect; preserve the invalid value as the string value of the header, but set the datetime attribute to None.
Add tests to test_email/test_headerregistry.py to confirm this behaviour; also added test to test_email/test_inversion.py to confirm emails with such defective date headers round trip successfully.
This pull request incorporates feedback gratefully received from @bitdancer, @brettcannon, @Mariatta and @warsaw, and replaces the earlier PR #2254.
Automerge-Triggered-By: GH:warsaw
Diffstat (limited to 'Lib/test/test_email/test_utils.py')
| -rw-r--r-- | Lib/test/test_email/test_utils.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py index 4e3c3f3..e3d3eae 100644 --- a/Lib/test/test_email/test_utils.py +++ b/Lib/test/test_email/test_utils.py @@ -48,6 +48,16 @@ class DateTimeTests(unittest.TestCase): utils.parsedate_to_datetime(self.datestring + ' -0000'), self.naive_dt) + def test_parsedate_to_datetime_with_invalid_raises_valueerror(self): + invalid_dates = ['', + '0', + 'A Complete Waste of Time' + 'Tue, 06 Jun 2017 27:39:33 +0600', + 'Tue, 06 Jun 2017 07:39:33 +2600', + 'Tue, 06 Jun 2017 27:39:33'] + for dtstr in invalid_dates: + with self.subTest(dtstr=dtstr): + self.assertRaises(ValueError, utils.parsedate_to_datetime, dtstr) class LocaltimeTests(unittest.TestCase): |