iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix modpython about renaming EModuleType.

Browse Source
This commit is contained in:
Alexey Sokolov
2011-08-22 00:55:45 +07:00
parent 288f450ea7
commit fca0d83de8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/modpython/znc.py
View File

@@ -150,7 +150,7 @@ class ModuleNV(collections.MutableMapping):
class Module:
description = '< Placeholder for a description >'
module_types = [ModuleTypeUser]
module_types = [CModInfo.UserModule]
wiki_page = ''
@@ -443,9 +443,9 @@ def load_module(modname, args, module_type, user, retmsg, modpython):
return 1
module = cl()
if module_type == ModuleTypeUser:
if module_type == CModInfo.UserModule:
module._cmod = CreateUserPyModule(user, modname, datapath, module, modpython)
elif module_type == ModuleTypeGlobal:
elif module_type == CModInfo.GlobalModule:
module._cmod = CreateGlobalPyModule(modname, datapath, module, modpython)
else:
retmsg.s = "Module [modpython] doesn't support module type."
@@ -457,13 +457,13 @@ def load_module(modname, args, module_type, user, retmsg, modpython):
module.SetModPath(pymodule.__file__)
module.SetType(module_type)
if module_type == ModuleTypeUser:
if module_type == CModInfo.UserModule:
if not user:
retmsg.s = "Module [modpython] needs user for for ModuleTypeUser."
retmsg.s = "Module [modpython] needs user for for UserModule."
unload_module(module)
return 1
user.GetModules().push_back(module._cmod)
elif module_type == ModuleTypeGlobal:
elif module_type == CModInfo.GlobalModule:
CZNC.Get().GetModules().push_back(module._cmod)
else:
retmsg.s = "Module [modpython] doesn't support module type."
@@ -509,9 +509,9 @@ def load_module(modname, args, module_type, user, retmsg, modpython):
def unload_module(module):
module.OnShutdown()
cmod = module._cmod
if module.GetType() == ModuleTypeUser:
if module.GetType() == CModInfo.UserModule:
cmod.GetUser().GetModules().removeModule(cmod)
elif module.GetType() == ModuleTypeGlobal:
elif module.GetType() == CModInfo.GlobalModule:
CZNC.Get().GetModules().removeModule(cmod)
del module._cmod
cmod.DeletePyModule()