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

Python modules use 'description' attribute of the class now.

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2208 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
darthgandalf
2010-12-24 16:45:22 +00:00
parent 517307b96a
commit 9745dcb4ea
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/modpython/znc.py
+6 -18
View File
@@ -237,6 +237,9 @@ def find_open(modname):
# nothing found # nothing found
return (None, None) return (None, None)
def get_descr(cls):
return getattr(cls, 'description', '< Placeholder for a description >')
def load_module(modname, args, user, retmsg, modpython): def load_module(modname, args, user, retmsg, modpython):
'''Returns 0 if not found, 1 on loading error, 2 on success''' '''Returns 0 if not found, 1 on loading error, 2 on success'''
if re.search(r'[^a-zA-Z0-9_]', modname) is not None: if re.search(r'[^a-zA-Z0-9_]', modname) is not None:
@@ -252,12 +255,7 @@ def load_module(modname, args, user, retmsg, modpython):
module = cl() module = cl()
module._cmod = CreatePyModule(user, modname, datapath, module, modpython) module._cmod = CreatePyModule(user, modname, datapath, module, modpython)
module.nv = ModuleNV(module._cmod) module.nv = ModuleNV(module._cmod)
descr = None module.SetDescription(get_descr(cl))
if '__doc__' in cl.__dict__:
descr = cl.__doc__
if descr is None:
descr = '< Placeholder for a description >'
module.SetDescription(descr)
module.SetArgs(args) module.SetArgs(args)
module.SetModPath(pymodule.__file__) module.SetModPath(pymodule.__file__)
user.GetModules().push_back(module._cmod) user.GetModules().push_back(module._cmod)
@@ -310,13 +308,8 @@ def get_mod_info(modname, retmsg, modinfo):
retmsg.s = "Python module [{0}] doesn't have class named [{1}]".format(pymodule.__file__, modname) retmsg.s = "Python module [{0}] doesn't have class named [{1}]".format(pymodule.__file__, modname)
return 1 return 1
cl = pymodule.__dict__[modname] cl = pymodule.__dict__[modname]
descr = None
if '__doc__' in cl.__dict__:
descr = cl.__doc__
if descr is None:
descr = '< Placeholder for a description >'
modinfo.SetGlobal(False) modinfo.SetGlobal(False)
modinfo.SetDescription(descr) modinfo.SetDescription(get_descr(cl))
modinfo.SetName(modname) modinfo.SetName(modname)
modinfo.SetPath(pymodule.__file__) modinfo.SetPath(pymodule.__file__)
return 2 return 2
@@ -339,13 +332,8 @@ def get_mod_info_path(path, modname, modinfo):
if modname not in pymodule.__dict__: if modname not in pymodule.__dict__:
return 0 return 0
cl = pymodule.__dict__[modname] cl = pymodule.__dict__[modname]
descr = None
if '__doc__' in cl.__dict__:
descr = cl.__doc__
if descr is None:
descr = '< Placeholder for a description >'
modinfo.SetGlobal(False) modinfo.SetGlobal(False)
modinfo.SetDescription(descr) modinfo.SetDescription(get_descr(cl))
modinfo.SetName(modname) modinfo.SetName(modname)
modinfo.SetPath(pymodule.__file__) modinfo.SetPath(pymodule.__file__)
return 1 return 1