From cbcfd32464ab34ac22ff85c5096e979a171ae54d Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Sat, 8 Jun 2019 08:26:25 -0500 Subject: [PATCH] Fix for yet more arbitrary py3 changes breaking code. Fixes #400 --- calibre-plugin/fff_plugin.py | 4 ++-- fanficfare/adapters/base_xenforoforum_adapter.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/calibre-plugin/fff_plugin.py b/calibre-plugin/fff_plugin.py index 26eb4155..0796dad7 100644 --- a/calibre-plugin/fff_plugin.py +++ b/calibre-plugin/fff_plugin.py @@ -1999,7 +1999,7 @@ class FanFicFarePlugin(InterfaceAction): for t in list(mi.tags) + list(old_tags): foldedcase_tags[t.lower()] = t - mi.tags = foldedcase_tags.values() + mi.tags = list(foldedcase_tags.values()) #print("mi.tags:%s"%mi.tags) if book['all_metadata']['langcode']: @@ -2171,7 +2171,7 @@ class FanFicFarePlugin(InterfaceAction): authurls = book['all_metadata']['authorUrl'].split(", ") authorlist = [ a.replace('&',';') for a in book['author'] ] authorids = db.new_api.get_item_ids('authors',authorlist) - authordata = db.new_api.author_data(authorids.values()) + authordata = db.new_api.author_data(list(authorids.values())) # print("\n\nauthorids:%s"%authorids) # print("authordata:%s"%authordata) diff --git a/fanficfare/adapters/base_xenforoforum_adapter.py b/fanficfare/adapters/base_xenforoforum_adapter.py index 50cb439a..cfc4d1fa 100644 --- a/fanficfare/adapters/base_xenforoforum_adapter.py +++ b/fanficfare/adapters/base_xenforoforum_adapter.py @@ -298,7 +298,7 @@ class BaseXenForoForumAdapter(BaseSiteAdapter): del threadmarkgroups[cat_name] # more categories left? new or at least unknown if threadmarkgroups: - cats = threadmarkgroups.keys() + cats = list(threadmarkgroups.keys()) # alphabetize for lack of a better idea to insure consist ordering cats.sort() for cat_name in cats: