Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3715: Plugin manager load/reload does not unload earlier versions of plugins

Browse Source 
svn: r14862
This commit is contained in:
Benny Malengier 2010-03-18 22:28:52 +00:00
parent 029d505706
commit e009296c4e
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PluginUtils/_PluginWindows.py
View File

@ -799,8 +799,8 @@ Location: %(fpath)s
model, node = selection.get_selected() model, node = selection.get_selected()
if not node: if not node:
return return
id = model.get_value(node, id_col) idv = model.get_value(node, id_col)
pdata = self.__preg.get_plugin(id) pdata = self.__preg.get_plugin(idv)
self.__pmgr.load_plugin(pdata) self.__pmgr.load_plugin(pdata)
self.__rebuild_load_list() self.__rebuild_load_list()

28
src/gen/plug/_manager.py
View File

@ -142,17 +142,36 @@ class BasePluginManager(object):
""" """
if pdata.id in self.__loaded_plugins: if pdata.id in self.__loaded_plugins:
return self.__loaded_plugins[pdata.id] return self.__loaded_plugins[pdata.id]
reload = False
filename = pdata.fname filename = pdata.fname
self.__attempt_list.append(filename) if filename in self.__attempt_list:
#new attempt after a fail, a reload needed
reload = True
dellist = []
for index, data in enumerate(self.__failmsg_list):
if data[0] == filename:
dellist.append(index)
dellist.reverse()
for index in dellist:
del self.__failmsg_list[index]
else:
self.__attempt_list.append(filename)
plugin = pdata.mod_name plugin = pdata.mod_name
try: try:
_module = __import__(plugin) _module = __import__(plugin)
if reload:
# For some strange reason second importing of a failed plugin
# results in success. Then reload reveals the actual error.
# Looks like a bug in Python.
reload(_module)
self.__success_list.append((filename, _module, pdata)) self.__success_list.append((filename, _module, pdata))
self.__loaded_plugins[pdata.id] = _module self.__loaded_plugins[pdata.id] = _module
self.__mod2text[_module.__name__] = pdata.description self.__mod2text[_module.__name__] = pdata.description
return _module return _module
except: except:
self.__failmsg_list.append((filename, sys.exc_info(), pdata)) self.__failmsg_list.append((filename, sys.exc_info(), pdata))
return None return None
def empty_managed_plugins(self): def empty_managed_plugins(self):
@ -174,7 +193,8 @@ class BasePluginManager(object):
# attempt to reload all plugins that have succeeded in the past # attempt to reload all plugins that have succeeded in the past
self.empty_managed_plugins() self.empty_managed_plugins()
for plugin in self.__success_list: dellist = []
for (index, plugin) in enumerate(self.__success_list):
filename = plugin[0] filename = plugin[0]
pdata = plugin[2] pdata = plugin[2]
filename = filename.replace('pyc','py') filename = filename.replace('pyc','py')
@ -182,7 +202,11 @@ class BasePluginManager(object):
try: try:
reload(plugin[1]) reload(plugin[1])
except: except:
dellist.append(index)
self.__failmsg_list.append((filename, sys.exc_info(), pdata)) self.__failmsg_list.append((filename, sys.exc_info(), pdata))
dellist.reverse()
for index in dellist:
del self.__success_list[index]
# Remove previously good plugins that are now bad # Remove previously good plugins that are now bad
# from the registered lists # from the registered lists