AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put vital unload code in a finally block

Browse Source
This commit is contained in:
David Vierra 2016-05-21 10:23:05 -10:00
parent 74458520db
commit a5584de41f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mcedit2/plugins/__init__.py
View File

@ -144,13 +144,9 @@ class PluginRef(object):
if self.pluginModule is None: if self.pluginModule is None:
return return
module = self.pluginModule module = self.pluginModule
self.pluginModule = None
try: try:
self.unregisterModule() self.unregisterModule()
for k, v in sys.modules.iteritems():
if v is module:
sys.modules.pop(k)
log.info("Removed module %s from sys.modules", k)
except Exception as e: except Exception as e:
self.unloadError = sys.exc_info() self.unloadError = sys.exc_info()
@ -158,6 +154,12 @@ class PluginRef(object):
return False return False
else: else:
self.unloadError = None self.unloadError = None
finally:
self.pluginModule = None
for k, v in sys.modules.iteritems():
if v is module:
sys.modules.pop(k)
log.info("Removed module %s from sys.modules", k)
return True return True