marcel/linkding
1
0
Fork 0
mirror of https://github.com/sissbruecker/linkding.git synced 2025-08-08 03:08:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove deprecated API usage

Browse Source
This commit is contained in:
Sascha Ißbrücker
2024-09-19 19:29:01 +02:00
parent 3d8866c7bc
commit 6cf5fb396a
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bookmarks/utils.py
View File

@@ -2,7 +2,7 @@ import logging
import re
import unicodedata
import urllib.parse
from datetime import datetime
import datetime
from typing import Optional
from dateutil.relativedelta import relativedelta
@@ -33,7 +33,9 @@ weekday_names = {
}
def humanize_absolute_date(value: datetime, now: Optional[datetime] = None):
def humanize_absolute_date(
value: datetime.datetime, now: Optional[datetime.datetime] = None
):
if not now:
now = timezone.now()
delta = relativedelta(now, value)
@@ -51,7 +53,9 @@ def humanize_absolute_date(value: datetime, now: Optional[datetime] = None):
return weekday_names[value.isoweekday()]
def humanize_relative_date(value: datetime, now: Optional[datetime] = None):
def humanize_relative_date(
value: datetime.datetime, now: Optional[datetime.datetime] = None
):
if not now:
now = timezone.now()
delta = relativedelta(now, value)
@@ -87,21 +91,21 @@ def parse_timestamp(value: str):
raise ValueError(f"{value} is not a valid timestamp")
try:
return datetime.utcfromtimestamp(timestamp).astimezone()
return datetime.datetime.fromtimestamp(timestamp, datetime.UTC)
except (OverflowError, ValueError, OSError):
pass
# Value exceeds the max. allowed timestamp
# Try parsing as microseconds
try:
return datetime.utcfromtimestamp(timestamp / 1000).astimezone()
return datetime.datetime.fromtimestamp(timestamp / 1000, datetime.UTC)
except (OverflowError, ValueError, OSError):
pass
# Value exceeds the max. allowed timestamp
# Try parsing as nanoseconds
try:
return datetime.utcfromtimestamp(timestamp / 1000000).astimezone()
return datetime.datetime.fromtimestamp(timestamp / 1000000, datetime.UTC)
except (OverflowError, ValueError, OSError):
pass