Fix plugin unloading. Again.

diff --git a/pyva/pyva/src/main/python/plugin.py b/pyva/pyva/src/main/python/plugin.py
index 7931c401adb457a4cb3f3ac11e898a86b955275a..0d28a7748db79c6b6ebf31ebb2831d66adae1f35 100644 (file)
--- a/pyva/pyva/src/main/python/plugin.py
+++ b/pyva/pyva/src/main/python/plugin.py
@@ -42,16 +42,12 @@ def loadPlugin(plugin):
 def unloadPlugin(plugin):
        global modules
 
-       modname = plugin_to_modname(plugin)
-
        obj = modules[plugin]
        obj.stop()
 
-       deps = [module for module in sys.modules if module.startswith(modname + '.')]
+       deps = [module for module in sys.modules if module.startswith(plugin + '.')]
        for dep in deps:
                del sys.modules[dep]
-       if modname in sys.modules:
-               del sys.modules[modname]
 
        del modules[plugin]