Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1890 from pbiering/fix-1851-1888

Browse Source 
Fix: out-of-range timestamp on 32-bit systems
This commit is contained in:
Peter Bieringer
2025-10-01 20:45:00 +02:00
committed by GitHub
parent 4080d2cadd 2d36346d96
commit d1f262b8cd
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -2,6 +2,7 @@
## 3.5.8.dev ## 3.5.8.dev
* Extend [auth]: re-factor & overhaul LDPA autrhentication, especially for Python's ldap module * Extend [auth]: re-factor & overhaul LDPA autrhentication, especially for Python's ldap module
* Fix: out-of-range timestamp on 32-bit systems
## 3.5.7 ## 3.5.7
* Extend: [auth] dovecot: add support for version >= 2.4 * Extend: [auth] dovecot: add support for version >= 2.4

5
radicale/utils.py
View File

@@ -280,10 +280,7 @@ def format_ut(unixtime: int) -> str:
# TODO check how to support this better # TODO check how to support this better
return str(unixtime) return str(unixtime)
if unixtime < DATETIME_MAX_UNIXTIME: if unixtime < DATETIME_MAX_UNIXTIME:
if sys.version_info < (3, 11): dt = datetime.datetime(1970, 1, 1, tzinfo=datetime.timezone.utc) + datetime.timedelta(seconds=unixtime)
dt = datetime.datetime.utcfromtimestamp(unixtime)
else:
dt = datetime.datetime.fromtimestamp(unixtime, datetime.UTC)
r = str(unixtime) + "(" + dt.strftime('%Y-%m-%dT%H:%M:%SZ') + ")" r = str(unixtime) + "(" + dt.strftime('%Y-%m-%dT%H:%M:%SZ') + ")"
else: else:
r = str(unixtime) + "(>MAX:" + str(DATETIME_MAX_UNIXTIME) + ")" r = str(unixtime) + "(>MAX:" + str(DATETIME_MAX_UNIXTIME) + ")"