Release 4.0.3: Bug fix for TypeError in Telegram backend

After fixing this bug I realized that pull request #2 fixes
the same bug as well, although in a slightly different way:

#2

In case anyone is wondering: I'm only just now looking through this pull
request, not yet sure what to do with the rest of the suggested changes.

Author: xolox

CHANGELOG.rst

@@ -11,6 +11,34 @@ to `semantic versioning`_.
 .. _Keep a Changelog: http://keepachangelog.com/
 .. _semantic versioning: http://semver.org/
 
+`Release 4.0.3`_ (2020-03-27)
+-----------------------------
+
+Bug fix for the following :exc:`~exceptions.TypeError` exception raised by the Telegram backend:
+
+.. code-block:: python
+
+   Traceback (most recent call last):
+     File "../lib/python3.5/site-packages/chat_archive/cli.py", line 199, in main
+       command_fn(arguments)
+     File "../lib/python3.5/site-packages/chat_archive/cli.py", line 286, in sync_cmd
+       self.synchronize(*arguments)
+     File "../lib/python3.5/site-packages/chat_archive/__init__.py", line 335, in synchronize
+       self.initialize_backend(backend_name, account_name).synchronize()
+     File "../lib/python3.5/site-packages/chat_archive/backends/telegram.py", line 97, in synchronize
+       event_loop.run_until_complete(self.connect_then_sync())
+     File "/usr/lib/python3.5/asyncio/base_events.py", line 467, in run_until_complete
+       return future.result()
+     File "/usr/lib/python3.5/asyncio/futures.py", line 294, in result
+       raise self._exception
+     File "/usr/lib/python3.5/asyncio/tasks.py", line 240, in _step
+       result = coro.send(None)
+     File "../lib/python3.5/site-packages/chat_archive/backends/telegram.py", line 124, in connect_then_sync
+       elif dialog.date > conversation_in_db.last_modified:
+   TypeError: can't compare offset-naive and offset-aware datetimes
+
+.. _Release 4.0.3: https://github.com/xolox/python-chat-archive/compare/4.0.2...4.0.3
+
 `Release 4.0.2`_ (2018-12-31)
 -----------------------------
 

chat_archive/__init__.py

@@ -1,7 +1,7 @@
 # Easy to use offline chat archive.
 #
 # Author: Peter Odding <[email protected]>
-# Last Change: December 31, 2018
+# Last Change: March 27, 2020
 # URL: https://github.com/xolox/python-chat-archive
 
 """Python API for the `chat-archive` program."""
@@ -29,7 +29,7 @@
 """The name of the default account (a string)."""
 
 # Semi-standard package versioning.
-__version__ = "4.0.2"
+__version__ = "4.0.3"
 
 # Initialize a logger for this module.
 logger = VerboseLogger(__name__)

chat_archive/backends/telegram.py

@@ -1,7 +1,7 @@
 # Easy to use offline chat archive.
 #
 # Author: Peter Odding <[email protected]>
-# Last Change: August 1, 2018
+# Last Change: March 27, 2020
 # URL: https://github.com/xolox/python-chat-archive
 
 """
@@ -25,7 +25,7 @@
 # Modules included in our package.
 from chat_archive.backends import ChatArchiveBackend
 from chat_archive.models import Account, Conversation
-from chat_archive.utils import ensure_directory_exists, get_secret
+from chat_archive.utils import ensure_directory_exists, get_secret, strip_tzinfo
 
 FRIENDLY_NAME = "Telegram"
 """A user friendly name for the chat service supported by this backend (a string)."""
@@ -121,7 +121,7 @@ async def connect_then_sync(self):
                 )
                 if not conversation_in_db.import_complete:
                     await self.perform_initial_sync(dialog, conversation_in_db)
-                elif dialog.date > conversation_in_db.last_modified:
+                elif strip_tzinfo(dialog.date) > strip_tzinfo(conversation_in_db.last_modified):
                     logger.info("Conversation was updated (%s) ..", dialog.id)
                     await self.update_conversation(dialog, conversation_in_db)
                     conversation_in_db.last_modified = dialog.date

chat_archive/utils.py

@@ -1,7 +1,7 @@
 # Easy to use offline chat archive.
 #
 # Author: Peter Odding <[email protected]>
-# Last Change: August 1, 2018
+# Last Change: March 27, 2020
 # URL: https://github.com/xolox/python-chat-archive
 
 """Utility functions for the `chat-archive` program."""
@@ -98,6 +98,11 @@ def prompt_for_password(prompt_text):
     return getpass.getpass(prompt_text)
 
 
+def strip_tzinfo(value):
+    """Strip timezone information from :class:`datetime.datetime` objects to enable comparison."""
+    return value if value.tzinfo is None else value.replace(tzinfo=None)
+
+
 def utc_to_local(utc_value):
     """Convert a UTC :class:`~datetime.datetime` object to the local timezone."""
     epoch = time.mktime(utc_value.timetuple())