Merge pull request #433 from carbonblack/fix-fromisoformat

Fix fromisoformat
carbonblack · Oct 24, 2023 · 2915360 · 2915360
2 parents af328a4 + 5e0cdb1
commit 2915360
Show file tree

Hide file tree

Showing 4 changed files with 126 additions and 100 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -8,6 +8,8 @@ validators
 jsonschema
 keyring;platform_system=='Darwin'
 boto3
+backports-datetime-fromisoformat==2.0.1
+
 
 # Dev dependencies
 pytest==7.2.1

diff --git a/setup.py b/setup.py
@@ -24,7 +24,8 @@
     'validators',
     'jsonschema',
     "keyring;platform_system=='Darwin'",
-    'boto3'
+    'boto3',
+    'backports-datetime-fromisoformat==2.0.1'
 ]
 
 extras_require = {

diff --git a/src/cbc_sdk/platform/alerts.py b/src/cbc_sdk/platform/alerts.py
@@ -29,6 +29,8 @@
 from cbc_sdk.platform.legacy_alerts import LegacyAlertSearchQueryCriterionMixin
 from cbc_sdk.platform.jobs import Job
 
+from backports._datetime_fromisoformat import datetime_fromisoformat
+
 """Alert Models"""
 
 MAX_RESULTS_LIMIT = 10000
@@ -1127,9 +1129,9 @@ def _create_valid_time_filter(self, kwargs):
             etime = kwargs["end"]
             try:
                 if isinstance(stime, str):
-                    stime = datetime.datetime.fromisoformat(stime)
+                    stime = datetime_fromisoformat(stime)
                 if isinstance(etime, str):
-                    etime = datetime.datetime.fromisoformat(etime)
+                    etime = datetime_fromisoformat(etime)
                 if isinstance(stime, datetime.datetime) and isinstance(etime, datetime.datetime):
                     time_filter = {"start": stime.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
                                    "end": etime.strftime("%Y-%m-%dT%H:%M:%S.%fZ")}