mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-25 04:17:40 +00:00
Code Issues Releases Wiki Activity

Make datetime utcnow compatible to older python versions

Browse Source
This commit is contained in:
Ozzie Isaacs
2024-08-10 21:05:29 +02:00
parent a56d1c80ae
commit 7a8d054b28
9 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cps/helper.py
View File

@@ -25,7 +25,7 @@ import re
import regex
import shutil
import socket
from datetime import datetime, timedelta, UTC
from datetime import datetime, timedelta, timezone
import requests
import unidecode
from uuid import uuid4
@@ -793,7 +793,7 @@ def get_book_cover_thumbnail(book, resolution):
.filter(ub.Thumbnail.type == THUMBNAIL_TYPE_COVER)
.filter(ub.Thumbnail.entity_id == book.id)
.filter(ub.Thumbnail.resolution == resolution)
.filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.now(UTC)))
.filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.now(timezone.utc)))
.first())
@@ -831,7 +831,7 @@ def get_series_thumbnail(series_id, resolution):
.filter(ub.Thumbnail.type == THUMBNAIL_TYPE_SERIES)
.filter(ub.Thumbnail.entity_id == series_id)
.filter(ub.Thumbnail.resolution == resolution)
.filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.now(UTC)))
.filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.now(timezone.utc)))
.first())