Nekmo · Nekmo · Oct 15, 2023 · Oct 12, 2023 · Oct 12, 2023 · Oct 12, 2023
diff --git a/pip_rating/rating.py b/pip_rating/rating.py
@@ -1,6 +1,7 @@
 import datetime
 import json
 import os
+import logging
 from functools import cached_property
 from pathlib import Path
 from typing import TYPE_CHECKING, TypedDict, Optional, Union, List, Tuple, Dict
@@ -11,6 +12,8 @@
 from pip_rating.sources.audit import Vulnerability
 
 from pip_rating.sources.sourcerank import SourceRankBreakdown
+from pip_rating.utils import parse_iso_datetime
+
 
 if TYPE_CHECKING:
     from pip_rating.packages import Package
@@ -138,12 +141,21 @@ def __init__(
         self.breakdown_key = breakdown_key
         self.scores = scores
         self.default = default
+        self.logger = logging.getLogger(__name__)
 
     def get_score(self, package_rating: "PackageRating") -> ScoreValue:
         iso_dt = self.get_breakdown_value(package_rating)
         if not iso_dt:
             return ScoreValue(0)
-        dt = datetime.datetime.fromisoformat(iso_dt)
+        try:
+            dt = parse_iso_datetime(iso_dt)
+        except ValueError:
+            self.logger.warning(
+                "Invalid datetime received for package %s: %s",
+                package_rating.package.name,
+                iso_dt,
+            )
+            return ScoreValue(0)
         dt_delta = datetime.datetime.now(datetime.timezone.utc) - dt
         for delta, score in self.scores.items():
             if dt_delta < delta:

diff --git a/pip_rating/utils.py b/pip_rating/utils.py
@@ -0,0 +1,15 @@
+import sys
+from datetime import datetime
+
+
+def parse_iso_datetime(iso_dt):
+    if sys.version_info >= (3, 11):
+        dt = datetime.fromisoformat(iso_dt)
+    else:
+        from dateutil import parser as dateutil_parser
+
+        try:
+            dt = datetime.fromisoformat(iso_dt)
+        except ValueError:
+            dt = dateutil_parser.isoparse(iso_dt)
+    return dt
diff --git a/requirements.in b/requirements.in
@@ -7,3 +7,4 @@ pipfile>=0.0.2,<0.1.0
 requests >=2.20.0,<3.0.0
 rich>=12.0.0
 tomlkit>=0.5.1,<1.0.0; python_version < '3.11'
+python-dateutil>=2.8.1; python_version < '3.11'
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
 #    pip-compile
@@ -59,6 +59,8 @@ pygments==2.15.1
     # via rich
 pyparsing==3.1.0
     # via pip-requirements-parser
+python-dateutil==2.8.2 ; python_version < "3.11"
+    # via -r requirements.in
 requests==2.31.0
     # via
     #   -r requirements.in
@@ -72,6 +74,7 @@ six==1.16.0
     # via
     #   anytree
     #   html5lib
+    #   python-dateutil
 sortedcontainers==2.4.0
     # via cyclonedx-python-lib
 soupsieve==2.4.1
@@ -80,6 +83,8 @@ toml==0.10.2
     # via
     #   pip-audit
     #   pipfile
+tomlkit==0.12.1 ; python_version < "3.11"
+    # via -r requirements.in
 urllib3==2.0.3
     # via requests
 webencodings==0.5.1

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -0,0 +1,24 @@
+import sys
+import unittest
+import datetime
+from pip_rating.utils import parse_iso_datetime
+
+
+class TestParseIsoDatetime(unittest.TestCase):
+    @unittest.skipIf(sys.version_info < (3, 11), "Test for Python 3.11 or higher")
+    def test_python_311_or_higher(self):
+        expected_dt = datetime.datetime(
+            2023, 9, 14, 18, 56, 29, 702900, tzinfo=datetime.timezone.utc
+        )
+        iso_dt = "2023-09-14T18:56:29.702900Z"
+        result = parse_iso_datetime(iso_dt)
+        self.assertEqual(result, expected_dt)
+
+    @unittest.skipIf(sys.version_info >= (3, 11), "Test for Python 3.10 or lower")
+    def test_python_310_or_lower(self):
+        expected_dt = datetime.datetime(
+            2023, 9, 14, 18, 56, 29, 702900, tzinfo=datetime.timezone.utc
+        )
+        iso_dt = "2023-09-14T18:56:29.702900Z"
+        result = parse_iso_datetime(iso_dt)
+        self.assertEqual(result, expected_dt)