NXDRIVE-2967: Upgrade the deprecated datetime adapter..

.github/workflows/dead_code.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip

.github/workflows/functional_tests.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
@@ -63,7 +63,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~/Library/Caches/pip
@@ -93,7 +93,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~\AppData\Local\pip\Cache
@@ -129,7 +129,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip

.github/workflows/functional_tests_2023.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
@@ -63,7 +63,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~/Library/Caches/pip
@@ -93,7 +93,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~\AppData\Local\pip\Cache
@@ -123,7 +123,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip

.github/workflows/integration_tests.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
           architecture: "x86"
       - uses: actions/cache@v4
         with:

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip

.github/workflows/spell.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip

.github/workflows/style.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip

.github/workflows/translations.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip

.github/workflows/types.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip

.github/workflows/unit_tests.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
@@ -56,7 +56,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
       - uses: actions/cache@v4
         with:
           path: ~/Library/Caches/pip
@@ -87,7 +87,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9 # XXX_PYTHON
+          python-version: 3.12 # XXX_PYTHON
           architecture: "x86"
       - uses: actions/cache@v4
         with:

docs/deployment.md

@@ -52,7 +52,7 @@ Executing the script without argument will setup.update the isolated environment
 
 [//]: # (XXX_PYTHON, XXX_INNO_SETUP)
 
-- [Python 3.9.5](https://www.python.org/ftp/python/3.9.5/python-3.9.5.exe).
+- [Python 3.12.3](https://www.python.org/ftp/python/3.12.3/python-3.12.3.exe).
 - [Inno Setup 6.1.2](http://www.jrsoftware.org/isdl.php) to create the installer.
 
 ### Troubleshooting

docs/gnu_linux.md

@@ -28,7 +28,7 @@ sudo mount -o remount,user_xattr /dev/sda3
 
 [//]: # (XXX_PYTHON)
 
-Nuxeo Drive is officially supported on **Python 3.9.1+**.
+Nuxeo Drive is officially supported on **Python 3.12.3+**.
 
 ## Installation
 

docs/support.md

@@ -45,7 +45,7 @@ It may evolve quickly without notification as we are following the Python develo
 
 [//]: # (XXX_PYTHON)
 
-As of now, we are using the __Python 3.9.5__.
+As of now, we are using the __Python 3.12.3__.
 
 History:
 

nxdrive/client/local/base.py

@@ -6,7 +6,7 @@
 import unicodedata
 import uuid
 from contextlib import suppress
-from datetime import datetime
+from datetime import datetime, timezone
 from logging import getLogger
 from pathlib import Path
 from tempfile import mkdtemp
@@ -263,12 +263,12 @@
         stat_info = os_path.stat()
         size = 0 if folderish else stat_info.st_size
         try:
-            mtime = datetime.utcfromtimestamp(stat_info.st_mtime)
+            mtime = datetime.fromtimestamp(stat_info.st_mtime, tz=timezone.utc)
         except (ValueError, OverflowError, OSError) as e:
             log.warning(
                 f"{e} file path: {os_path}. st_mtime value: {stat_info.st_mtime}"
             )
-            mtime = datetime.utcfromtimestamp(0)
+            mtime = datetime.fromtimestamp(0, tz=timezone.utc)
 
         # TODO Do we need to load it every time ?
         remote_ref = self.get_remote_id(ref)

nxdrive/dao/base.py

@@ -2,6 +2,7 @@
 Query formatting in this file is based on http://www.sqlstyle.guide/
 """
 
+from datetime import datetime, timezone
 import sys
 from contextlib import suppress
 from logging import getLogger
@@ -19,14 +20,20 @@
 
 log = getLogger(__name__)
 
-
 class AutoRetryCursor(Cursor):
+    def adapt_datetime_iso(self, val):
+        return datetime.fromtimestamp(val.strftime('%s'), tz=timezone.utc)
     def execute(self, sql: str, parameters: Iterable[Any] = ()) -> Cursor:
         count = 1
         while True:
             count += 1
             try:
-                return super().execute(sql, parameters)
+                import sqlite3
+                # return super().execute(sql, parameters)
+                # new_param = tuple( datetime.fromtimestamp(param, tz=timezone.utc) if isinstance(param, datetime) else param for param in parameters )
+                new_param = tuple( sqlite3.register_adapter(param, self.adapt_datetime_iso) if isinstance(param, datetime) else param for param in parameters )
+
+                return super().execute(sql, new_param)
             except OperationalError as exc:
                 log.info(
                     f"Retry locked database #{count}, {sql=}, {parameters=}",

nxdrive/dao/engine.py

@@ -6,7 +6,7 @@
 import os
 import shutil
 from contextlib import suppress
-from datetime import datetime
+from datetime import datetime, timezone
 from logging import getLogger
 from os.path import basename
 from pathlib import Path
@@ -1503,7 +1503,7 @@ def increase_error(
         self, row: DocPair, error: str, /, *, details: str = None, incr: int = 1
     ) -> None:
         with self.lock:
-            error_date = datetime.utcnow()
+            error_date = datetime.now(tz=timezone.utc)
             c = self._get_write_connection().cursor()
             c.execute(
                 "UPDATE States"
@@ -1592,7 +1592,7 @@ def unsynchronize_state(
                 "       error_count = 0,"
                 "       last_sync_error_date = NULL"
                 " WHERE id = ?",
-                (datetime.utcnow(), last_error, row.id),
+                (datetime.now(tz=timezone.utc), last_error, row.id),
             )
 
     def unset_unsychronised(self, row: DocPair, /) -> None:
@@ -1617,7 +1617,7 @@ def unset_unsychronised(self, row: DocPair, /) -> None:
                     row.local_state,
                     row.remote_state,
                     row.pair_state,
-                    datetime.utcnow(),
+                    datetime.now(tz=timezone.utc),
                     f"{adapt_path(row.local_path)}%",
                 ),
             )
@@ -1659,7 +1659,7 @@ def synchronize_state(
                     row.remote_state,
                     row.pair_state,
                     row.local_digest,
-                    datetime.utcnow(),
+                    datetime.now(tz=timezone.utc),
                     row.id,
                     version,
                 ),
@@ -1687,7 +1687,7 @@ def synchronize_state(
                         row.local_state,
                         row.remote_state,
                         row.pair_state,
-                        datetime.utcnow(),
+                        datetime.now(tz=timezone.utc),
                         row.id,
                         row.local_path,
                         row.remote_name,

nxdrive/engine/engine.py

@@ -1,10 +1,10 @@
-import datetime
 import json
 import os
 import os.path
 import shutil
 from contextlib import suppress
 from dataclasses import dataclass
+from datetime import datetime, timezone
 from functools import partial
 from logging import getLogger
 from pathlib import Path
@@ -1182,7 +1182,9 @@ def _check_last_sync(self) -> None:
             log.debug(f"Emitting syncPartialCompleted for engine {self.uid}")
             self.syncPartialCompleted.emit()
         else:
-            self.dao.update_config("last_sync_date", datetime.datetime.utcnow())
+            self.dao.update_config(
+                "last_sync_date", datetime.datetime.now(tz=timezone.utc)
+            )
             log.debug(f"Emitting syncCompleted for engine {self.uid}")
             self._sync_started = False
             self.syncCompleted.emit()

nxdrive/engine/watcher/remote_watcher.py

@@ -1,5 +1,5 @@
 import os
-from datetime import datetime
+from datetime import datetime, timezone
 from logging import getLogger
 from operator import attrgetter, itemgetter
 from time import monotonic, sleep
@@ -116,7 +116,7 @@ def scan_remote(self, *, from_state: DocPair = None) -> None:
 
         # Recursive update
         self._do_scan_remote(from_state, remote_info)
-        self._last_remote_full_scan = datetime.utcnow()
+        self._last_remote_full_scan = datetime.now(tz=timezone.utc)
         self.dao.update_config("remote_last_full_scan", self._last_remote_full_scan)
         self.dao.clean_scanned()
 

nxdrive/utils.py

@@ -13,7 +13,7 @@
 import sys
 from configparser import DEFAULTSECT, ConfigParser
 from copy import deepcopy
-from datetime import datetime
+from datetime import datetime, timezone
 from functools import lru_cache
 from itertools import islice
 from logging import getLogger
@@ -646,7 +646,7 @@ def get_certificate_details(
     Note: This function uses a undocumented method of the _ssl module.
           It is continuously tested in our CI to ensure it still
           available after any Python upgrade.
-          Certified working as of Python 3.9.5.
+          Certified working as of Python 3.12.3.
     """
 
     import ssl
@@ -1287,7 +1287,7 @@ def today_is_special() -> bool:
     """This beautiful day is special, isn't it? As all other days, right? :)"""
     return (
         os.getenv("I_LOVE_XMAS", "0") == "1"
-        or int(datetime.utcnow().strftime("%j")) >= 354
+        or int(datetime.now(tz=timezone.utc).strftime("%j")) >= 354
     )
 
 
@@ -1301,7 +1301,7 @@ def get_current_locale() -> str:
     else:
         import locale
 
-        encoding = locale.getdefaultlocale()[1] or ""
+        encoding = locale.getlocale()[1] or ""
 
     # Guess the current locale name
     if WINDOWS:
@@ -1315,7 +1315,7 @@ def get_current_locale() -> str:
         l10n_code = NSLocale.currentLocale()
         l10n = NSLocale.localeIdentifier(l10n_code)
     else:
-        l10n = locale.getdefaultlocale()[0] or ""
+        l10n = locale.getlocale()[1] or ""
 
     return ".".join([l10n, encoding])