mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #30803 -- Allowed comma separators for milliseconds in django.utils.dateparse functions.

Browse Source 
Co-Authored-By: Ben Wilber <benwilber@gmail.com>
This commit is contained in:
Farhaan Bukhsh
2019-09-25 16:17:22 -04:00
committed by Mariusz Felisiak
parent 42b23d1e79
commit 1f817daa20
4 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/utils_tests/test_dateparse.py
View File

@@ -23,6 +23,7 @@ class DateParseTests(unittest.TestCase):
self.assertEqual(parse_time('09:15:00'), time(9, 15))
self.assertEqual(parse_time('10:10'), time(10, 10))
self.assertEqual(parse_time('10:20:30.400'), time(10, 20, 30, 400000))
self.assertEqual(parse_time('10:20:30,400'), time(10, 20, 30, 400000))
self.assertEqual(parse_time('4:8:16'), time(4, 8, 16))
# Invalid inputs
self.assertIsNone(parse_time('091500'))
@@ -38,6 +39,7 @@ class DateParseTests(unittest.TestCase):
('2012-04-23T10:20:30.400+02:30', datetime(2012, 4, 23, 10, 20, 30, 400000, get_fixed_timezone(150))),
('2012-04-23T10:20:30.400+02', datetime(2012, 4, 23, 10, 20, 30, 400000, get_fixed_timezone(120))),
('2012-04-23T10:20:30.400-02', datetime(2012, 4, 23, 10, 20, 30, 400000, get_fixed_timezone(-120))),
('2012-04-23T10:20:30,400-02', datetime(2012, 4, 23, 10, 20, 30, 400000, get_fixed_timezone(-120))),
)
for source, expected in valid_inputs:
with self.subTest(source=source):
@@ -104,6 +106,7 @@ class DurationParseTests(unittest.TestCase):
('15:30.0001', timedelta(minutes=15, seconds=30, microseconds=100)),
('15:30.00001', timedelta(minutes=15, seconds=30, microseconds=10)),
('15:30.000001', timedelta(minutes=15, seconds=30, microseconds=1)),
('15:30,000001', timedelta(minutes=15, seconds=30, microseconds=1)),
)
for source, expected in test_values:
with self.subTest(source=source):
@@ -116,6 +119,7 @@ class DurationParseTests(unittest.TestCase):
('-15:30', timedelta(minutes=-15, seconds=-30)),
('-1:15:30', timedelta(hours=-1, minutes=-15, seconds=-30)),
('-30.1', timedelta(seconds=-30, milliseconds=-100)),
('-30,1', timedelta(seconds=-30, milliseconds=-100)),
('-00:01:01', timedelta(minutes=-1, seconds=-1)),
('-01:01', timedelta(seconds=-61)),
('-01:-01', None),