iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-07 05:44:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix global python modules.

Browse Source
This commit is contained in:
Alexey Sokolov
2011-08-10 01:04:58 +07:00
committed by Kyle Fuller
parent 76aaafd4d0
commit 0c9eae226e
4 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/modpython/znc.py
+9 -2
View File
@@ -438,11 +438,15 @@ def load_module(modname, args, user, retmsg, modpython):
return 1
cl = pymodule.__dict__[modname]
module = cl()
module._cmod = CreatePyModule(user, modname, datapath, module, modpython)
if user:
module._cmod = CreateUserPyModule(user, modname, datapath, module, modpython)
else:
module._cmod = CreateGlobalPyModule(modname, datapath, module, modpython)
module.nv = ModuleNV(module._cmod)
module.SetDescription(cl.description)
module.SetArgs(args)
module.SetModPath(pymodule.__file__)
module.SetType(cl.module_type)
if user:
user.GetModules().push_back(module._cmod)
@@ -488,8 +492,11 @@ def load_module(modname, args, user, retmsg, modpython):
def unload_module(module):
module.OnShutdown()
cmod = module._cmod
if module.GetType() == ModuleTypeUser:
cmod.GetUser().GetModules().removeModule(cmod)
elif module.GetType() == ModuleTypeGlobal:
CZNC.Get().GetModules().removeModule(cmod)
del module._cmod
cmod.GetUser().GetModules().removeModule(cmod)
cmod.DeletePyModule()
del cmod