Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

py3 fixes

Browse Source
This commit is contained in:
Kovid Goyal 2019-07-14 17:01:14 +05:30
parent 10e5d3c486
commit a528cef0ee
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/gui2/viewer/convert_book.py
View File

@ -10,7 +10,6 @@ import os
import shutil import shutil
import tempfile import tempfile
import time import time
from cPickle import dumps
from hashlib import sha1 from hashlib import sha1
from calibre import walk from calibre import walk
@ -19,6 +18,7 @@ from calibre.srv.render_book import RENDER_VERSION
from calibre.utils.ipc.simple_worker import fork_job from calibre.utils.ipc.simple_worker import fork_job
from calibre.utils.lock import ExclusiveFile from calibre.utils.lock import ExclusiveFile
from calibre.utils.short_uuid import uuid4 from calibre.utils.short_uuid import uuid4
from polyglot.builtins import as_bytes, as_unicode
DAY = 24 * 3600 DAY = 24 * 3600
@ -33,8 +33,10 @@ def cache_lock():
def book_hash(path, size, mtime): def book_hash(path, size, mtime):
path = os.path.normcase(os.path.abspath(path)) path = os.path.normcase(os.path.abspath(path))
raw = dumps((path, size, mtime, RENDER_VERSION)) raw = json.dumps((path, size, mtime, RENDER_VERSION))
return sha1(raw).hexdigest().decode('ascii') if not isinstance(raw, bytes):
raw = raw.encode('utf-8')
return as_unicode(sha1(raw).hexdigest())
def safe_makedirs(path): def safe_makedirs(path):
@ -123,7 +125,7 @@ def prepare_book(path, convert_func=do_convert, max_age=30 * DAY):
temp_path = safe_makedirs(os.path.join(book_cache_dir(), 't')) temp_path = safe_makedirs(os.path.join(book_cache_dir(), 't'))
def save_metadata(metadata, f): def save_metadata(metadata, f):
f.seek(0), f.truncate(), f.write(json.dumps(metadata, indent=2)) f.seek(0), f.truncate(), f.write(as_bytes(json.dumps(metadata, indent=2)))
with cache_lock() as f: with cache_lock() as f:
try: try: