Merge remote-tracking branch 'gl/milos/pyva+internets+add_google_image_search'

diff --git a/pyva/pyva/src/main/python/limitserv/limitmanager.py b/pyva/pyva/src/main/python/limitserv/limitmanager.py
index 64431c1811dc7759d01bea25b86115b3baf33d80..a7950c7fc1e92fbf5f9b3b011306be4ae38a7c6d 100644 (file)
--- a/pyva/pyva/src/main/python/limitserv/limitmanager.py
+++ b/pyva/pyva/src/main/python/limitserv/limitmanager.py
@@ -75,7 +75,7 @@ class LimitManager(object):
                if new_limit == old_limit or abs(new_limit - old_limit) < 2: #change mode only if the difference is >= 2
                        return
                
-               Acidictive.mode(self.module.nick, cname, "+l %d" % new_limit)
+               Acidictive.setMode(self.module.nick, cname, "+l %d" % new_limit)
                self.module.elog.command('%(chan)s [%(users)d users] Changed limit %(old_limit)d => %(new_limit)d' % {
                                'chan': cname,
                                'users': users,

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]