From fca0d83de815c91e729bf0ec91ac3d9c2bf3911f Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey@alexeysokolov.co.cc>
Date: Mon, 22 Aug 2011 00:55:45 +0700
Subject: [PATCH] Fix modpython about renaming EModuleType.

---
 modules/modpython/znc.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/modpython/znc.py b/modules/modpython/znc.py
index f394ef9322..66f7b1e88a 100644
--- a/modules/modpython/znc.py
+++ b/modules/modpython/znc.py
@@ -150,7 +150,7 @@ def __len__(self):
 
 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()