Commit 76c724c7 authored by blitzmann's avatar blitzmann

Remove global session object, this is now wrapped in the CalibreDB class

parent 032cb593
......@@ -51,8 +51,6 @@ try:
except ImportError:
use_unidecode = False
Session = None
cc_exceptions = ['datetime', 'comments', 'composite', 'series']
cc_classes = {}
......@@ -439,9 +437,6 @@ class CalibreDB():
cls.config = config
cls.dispose()
# todo: remove...?
global Session
if not config.config_calibre_dir:
config.invalidate()
return False
......
......@@ -53,7 +53,7 @@ class TaskConvert(CalibreTask):
def _convert_ebook_format(self):
error_message = None
local_session = db.Session()
local_session = db.CalibreDB()
file_path = self.file_path
book_id = self.bookid
format_old_ext = u'.' + self.settings['old_book_format'].lower()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment