mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
py3: Port thumbnail cache
All db tests now pass on python3
This commit is contained in:
parent
cb117bf118
commit
1f86d92f7a
@ -164,7 +164,7 @@ class ThumbnailCache(object):
|
||||
invalidate = set()
|
||||
try:
|
||||
with open(os.path.join(self.location, 'invalidate'), 'rb') as f:
|
||||
raw = f.read()
|
||||
raw = f.read().decode('utf-8')
|
||||
except EnvironmentError as err:
|
||||
if getattr(err, 'errno', None) != errno.ENOENT:
|
||||
self.log('Failed to read thumbnail invalidate data:', as_unicode(err))
|
||||
@ -208,7 +208,7 @@ class ThumbnailCache(object):
|
||||
def _invalidate_sizes(self):
|
||||
if self.size_changed:
|
||||
size = self.thumbnail_size
|
||||
remove = (key for key, entry in iteritems(self.items) if size != entry.thumbnail_size)
|
||||
remove = tuple(key for key, entry in iteritems(self.items) if size != entry.thumbnail_size)
|
||||
for key in remove:
|
||||
self._remove(key)
|
||||
self.size_changed = False
|
||||
|
Loading…
x
Reference in New Issue
Block a user