Merge branch 'master' into cap302

modules/modpython/CMakeLists.txt

@@ -75,7 +75,7 @@ target_include_directories(modpython_lib PRIVATE
 	"${CMAKE_CURRENT_BINARY_DIR}/.."
 	"${CMAKE_CURRENT_SOURCE_DIR}/.."
 	${Python3_INCLUDE_DIRS})
-target_link_libraries(modpython_lib ${znc_link} ${Python3_LDFLAGS})
+target_link_libraries(modpython_lib ZNC ${Python3_LDFLAGS})
 set_target_properties(modpython_lib PROPERTIES
 	PREFIX "_"
 	OUTPUT_NAME "znc_core"

modules/modpython/znc.py

@@ -943,33 +943,6 @@ def get_mod_info(modname, retmsg, modinfo):
     return 2
 
 
-def get_mod_info_path(path, modname, modinfo):
-    try:
-        x = imp.find_module(modname, [path])
-    except ImportError:
-        return 0
-    # x == (<open file './modules/admin.so', mode 'rb' at 0x7fa2dc748d20>,
-    #       './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 and x[2][2] != imp.PKG_DIRECTORY:
-        return 0
-    try:
-        pymodule = imp.load_module(modname, *x)
-    except ImportError:
-        return 0
-    finally:
-        if x[0]:
-            x[0].close()
-    if modname not in pymodule.__dict__:
-        return 0
-    cl = pymodule.__dict__[modname]
-    modinfo.SetName(modname)
-    modinfo.SetPath(pymodule.__file__)
-    gather_mod_info(cl, modinfo)
-    return 1
-
-
 CONTINUE = CModule.CONTINUE
 HALT = CModule.HALT
 HALTMODS = CModule.HALTMODS