Handle non-naive dates correctly

mailosaur · Oct 17, 2020 · 0cf872f · 0cf872f
1 parent 6e8c4ed
commit 0cf872f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/mailosaur/operations/messages_operations.py b/mailosaur/operations/messages_operations.py
@@ -110,7 +110,9 @@ def list(self, server, page=None, items_per_page=None, received_after=None):
         url = "%sapi/messages" % (self.base_url)
 
         if received_after is not None:
-            received_after = self.timezone.localize(received_after).isoformat()
+            if received_after.tzinfo is None or received_after.tzinfo.utcoffset(received_after) is None:
+                received_after = self.timezone.localize(received_after)
+            received_after = received_after.isoformat()
 
         params = {'server': server, 'page': page, 'itemsPerPage': items_per_page, 'receivedAfter': received_after}
         response = self.session.get(url, params=params)
@@ -174,7 +176,9 @@ def search(self, server, criteria, page=None, items_per_page=None, timeout=None,
         url = "%sapi/messages/search" % (self.base_url)
 
         if received_after is not None:
-            received_after = self.timezone.localize(received_after).isoformat()
+            if received_after.tzinfo is None or received_after.tzinfo.utcoffset(received_after) is None:
+                received_after = self.timezone.localize(received_after)
+            received_after = received_after.isoformat()
 
         params = {'server': server, 'page': page, 'itemsPerPage': items_per_page, 'receivedAfter': received_after}