From ae2b33ec7ba27df3386cb9ee1c336373d0ab0dd5 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Thu, 17 Dec 2020 20:07:56 -0600 Subject: [PATCH] Apply ensure_text() to INIs with plugin CLI. --- calibre-plugin/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index 330e1499..1e8320f2 100644 --- a/calibre-plugin/__init__.py +++ b/calibre-plugin/__init__.py @@ -117,6 +117,7 @@ class FanFicFareBase(InterfaceActionBase): from calibre.library import db from calibre_plugins.fanficfare_plugin.fanficfare.cli import main as fff_main from calibre_plugins.fanficfare_plugin.prefs import PrefsFacade + from calibre_plugins.fanficfare_plugin.fanficfare.six import ensure_text from calibre.utils.config import prefs as calibre_prefs from optparse import OptionParser @@ -129,12 +130,11 @@ class FanFicFareBase(InterfaceActionBase): pargs = [x for x in argv if x.startswith('--with-library') or x.startswith('--library-path') or not x.startswith('-')] opts, args = parser.parse_args(pargs) - fff_prefs = PrefsFacade(db(path=opts.library_path, - read_only=True)) + read_only=True)) fff_main(argv[1:], parser=parser, - passed_defaultsini=get_resources("fanficfare/defaults.ini"), - passed_personalini=fff_prefs["personal.ini"], + passed_defaultsini=ensure_text(get_resources("fanficfare/defaults.ini")), + passed_personalini=ensure_text(fff_prefs["personal.ini"]), )