Merge pull request #31 from jamesridgway/james/datetime-parse-improve…

…ments

Improvements to parsing datetime values

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

attachment_downloader/cli.py

@@ -2,10 +2,12 @@
 import sys
 from getpass import getpass
 
+from iso8601 import iso8601
+
 
 def valid_date(_, opt, value):
     try:
-        parsed_value = datetime.datetime.fromisoformat(value)
+        parsed_value = iso8601.parse_date(value)
         if not parsed_value.tzinfo:
             parsed_value = parsed_value.replace(tzinfo=datetime.timezone.utc)
         return parsed_value

requirements.txt

@@ -1,5 +1,6 @@
 assertpy==1.1
 imbox==0.9.8
+iso8601==1.0.2
 jinja2==2.11.3
 python-dateutil==2.8.2
 pylint==2.12.2

tests/attachment_downloader/test_cli.py

@@ -8,9 +8,17 @@
 
 class TestCli:
     def test_valid_date(self):
-        dt = pytz.utc.localize(datetime.datetime(2022, 3, 3, 13, 0, 0, 0))
         assert_that(valid_date(None, '--date-after', '2022-03-03T13:00:00'))\
-            .is_equal_to(dt)
+            .is_equal_to(pytz.utc.localize(datetime.datetime(2022, 3, 3, 13, 0, 0, 0)))
+
+        assert_that(valid_date(None, '--date-after', '2022-03-03T13:00:00Z')) \
+            .is_equal_to(pytz.utc.localize(datetime.datetime(2022, 3, 3, 13, 0, 0, 0)))
+
+        assert_that(valid_date(None, '--date-after', '2022-03-03T13:00:00+00:00')) \
+            .is_equal_to(pytz.utc.localize(datetime.datetime(2022, 3, 3, 13, 0, 0, 0)))
+
+        assert_that(valid_date(None, '--date-after', '2022-03-03T13:00:00.123456+00:00')) \
+            .is_equal_to(pytz.utc.localize(datetime.datetime(2022, 3, 3, 13, 0, 0, 123456)))
 
     def test_valid_date_exception_if_invalid(self):
         assert_that(valid_date)\