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

Merge branch 'py3' of https://github.com/eli-schwartz/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2019-04-25 09:37:07 +05:30
commit 7d6338caa8
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/utils/complete.py
View File

@ -117,7 +117,7 @@ class EbookConvert(object):
self.previous = words[-2 if prefix else -1] self.previous = words[-2 if prefix else -1]
from calibre.utils.serialize import msgpack_loads from calibre.utils.serialize import msgpack_loads
self.cache = msgpack_loads(open(os.path.join(sys.resources_location, self.cache = msgpack_loads(open(os.path.join(sys.resources_location,
'ebook-convert-complete.calibre_msgpack'), 'rb').read()) 'ebook-convert-complete.calibre_msgpack'), 'rb').read(), use_list=False)
self.complete(wc) self.complete(wc)
def complete(self, wc): def complete(self, wc):

5
src/calibre/utils/serialize.py
View File

@ -107,9 +107,10 @@ def msgpack_decoder(code, data):
return decoders[code](msgpack_loads(data), False) return decoders[code](msgpack_loads(data), False)
def msgpack_loads(dump): def msgpack_loads(dump, use_list=True):
# use_list controls whether msgpack arrays are unpacked as lists or tuples
import msgpack import msgpack
return msgpack.unpackb(dump, ext_hook=msgpack_decoder, raw=False) return msgpack.unpackb(dump, ext_hook=msgpack_decoder, raw=False, use_list=use_list)
def json_loads(data): def json_loads(data):