AaronFiore/electrum
1
0
Fork 0
Code Activity

plugins: fix hook/attr name collision in close()

Browse Source 
Revealer plugin has method "password_dialog"
"password_dialog" is also a hook name, but revealer.password_dialog is not a hook
This commit is contained in:
SomberNight
2018-12-19 02:10:47 +01:00
parent fa33d1880c
commit ba33bc4ad8
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
electrum/plugin.py
View File

@@ -251,11 +251,16 @@ class BasePlugin(PrintError):
def close(self): def close(self):
# remove self from hooks # remove self from hooks
for k in dir(self): for attr_name in dir(self):
if k in hook_names: if attr_name in hook_names:
l = hooks.get(k, []) # found attribute in self that is also the name of a hook
l.remove((self, getattr(self, k))) l = hooks.get(attr_name, [])
hooks[k] = l try:
l.remove((self, getattr(self, attr_name)))
except ValueError:
# maybe attr name just collided with hook name and was not hook
continue
hooks[attr_name] = l
self.parent.close_plugin(self) self.parent.close_plugin(self)
self.on_close() self.on_close()