Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

typo that suppressed error traceback when failing to load editor plugin tools

Browse Source
This commit is contained in:
Kovid Goyal 2017-01-23 20:24:54 +05:30
parent 1027a80786
commit d66bf44544
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/tweak_book/plugin.py
View File

@ -117,7 +117,7 @@ def load_plugin_tools(plugin):
main = importlib.import_module(plugin.__class__.__module__+'.main') main = importlib.import_module(plugin.__class__.__module__+'.main')
except ImportError: except ImportError:
import traceback import traceback
traceback.print_stack() traceback.print_exc()
else: else:
for x in vars(main).itervalues(): for x in vars(main).itervalues():
if isinstance(x, type) and x is not Tool and issubclass(x, Tool): if isinstance(x, type) and x is not Tool and issubclass(x, Tool):
@ -129,6 +129,7 @@ def load_plugin_tools(plugin):
def plugin_action_sid(plugin, tool, for_toolbar=True): def plugin_action_sid(plugin, tool, for_toolbar=True):
return plugin.name + tool.name + ('toolbar' if for_toolbar else 'menu') return plugin.name + tool.name + ('toolbar' if for_toolbar else 'menu')
plugin_toolbar_actions = [] plugin_toolbar_actions = []
@ -160,6 +161,7 @@ def create_plugin_action(plugin, tool, for_toolbar, actions=None, toolbar_action
plugin_menu_actions.append(ac) plugin_menu_actions.append(ac)
return ac return ac
_tool_memory = [] # Needed to prevent the tool object from being garbage collected _tool_memory = [] # Needed to prevent the tool object from being garbage collected
@ -182,4 +184,3 @@ def install_plugin(plugin):
sid = plugin_action_sid(plugin, tool, True) sid = plugin_action_sid(plugin, tool, True)
if sid not in tprefs['global_plugins_toolbar']: if sid not in tprefs['global_plugins_toolbar']:
tprefs['global_plugins_toolbar'] = tprefs['global_plugins_toolbar'] + [sid] tprefs['global_plugins_toolbar'] = tprefs['global_plugins_toolbar'] + [sid]