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

Allow loading python modules with modpython (ex. modname/__init__.py)

Browse Source 
Fixes #58
This commit is contained in:
Kyle Fuller
2011-08-31 17:17:19 +00:00
parent 1f16d6dc32
commit d14528b59e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/modpython/znc.py
View File

@@ -396,7 +396,7 @@ def find_open(modname):
# './modules/admin.so', ('.so', 'rb', 3))
# x == (<open file './modules/pythontest.py', mode 'U' at
# 0x7fa2dc748d20>, './modules/pythontest.py', ('.py', 'U', 1))
if x[0] is None:
if x[0] is None and x[2][2] != imp.PKG_DIRECTORY:
# the same
continue
if x[2][0] == '.so':
@@ -416,7 +416,8 @@ def find_open(modname):
try:
pymodule = imp.load_module(modname, *x)
finally:
x[0].close()
if x[0]:
x[0].close()
return (pymodule, d[1])
else:
# nothing found
@@ -548,7 +549,7 @@ def get_mod_info_path(path, modname, modinfo):
# './modules/admin.so', ('.so', 'rb', 3))
# x == (<open file './modules/pythontest.py', mode 'U' at 0x7fa2dc748d20>,
# './modules/pythontest.py', ('.py', 'U', 1))
if x[0] is None:
if x[0] is None and x[2][2] != imp.PKG_DIRECTORY:
return 0
try:
pymodule = imp.load_module(modname, *x)