From 124310d536b205133627787f9eacc3686d9c2153 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 26 Jul 2014 23:50:42 +0530 Subject: [PATCH] Fix one remaining unsafe use of read_lock. Fixes #1348937 [Downgrade Lock Error: cant downgrade Lock Object](https://bugs.launchpad.net/calibre/+bug/1348937) --- src/calibre/gui2/library/models.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 6b7320164c..097648a324 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -760,14 +760,11 @@ class BooksModel(QAbstractTableModel): # {{{ return QVariant(int(fffunc(field_obj, idfunc(idx), default_value=0)/2.0)) elif dt == 'series': sidx_field = self.db.new_api.fields[field + '_index'] - fffunc = self.db.new_api._fast_field_for - read_lock = self.db.new_api.read_lock def func(idx): book_id = idfunc(idx) - with read_lock: - series = fffunc(field_obj, book_id, default_value=False) - if series: - return QVariant('%s [%s]' % (series, fmt_sidx(fffunc(sidx_field, book_id, default_value=1.0)))) + series = fffunc(field_obj, book_id, default_value=False) + if series: + return QVariant('%s [%s]' % (series, fmt_sidx(fffunc(sidx_field, book_id, default_value=1.0)))) return NONE elif dt in {'int', 'float'}: fmt = m['display'].get('number_format', None)