Bugfixes in numerous import processes

Replace some old pure python import by LodelContext calls
Change the plugins imports methods to use LodelContext instead
Fixes dyncode exposure method

lodel/context.py

@@ -166,6 +166,13 @@ length == 2 but got : %s" % spec)
             self._expose_module(globs, module_fullname, exposure_spec)
         else:
             self._expose_objects(globs, module_fullname, exposure_spec)
+
+    ##@brief Return a module from current context
+    def get_module(self, fullname):
+        fullname = self._translate(fullname)
+        module = importlib.import_module(fullname)
+        return module
+        
     
     ##@brief Delete a site's context
     #@param site_id str : the site's name to remove the context
@@ -210,7 +217,10 @@ site_id set to None when we are in MULTISITE beahavior")
 : '%s'" % site_id)
         if site_id not in cls._contexts:
             raise ContextError("No context named '%s' found." % site_id)
-        cls._current = cls._contexts[site_id]
+        wanted_ctx = cls._contexts[site_id]
+        if hasattr(wanted_ctx, '__instance_path'):
+            os.chdir(self.__instance_path) #May cause problems
+        cls._current = wanted_ctx
         return cls._current
     
     ##@brief Getter for contexts
@@ -271,6 +281,12 @@ site_id set to None when we are in MULTISITE beahavior")
         for spec in specs.items():
             ctx.expose(globs, spec)
     
+    ##@brief Return a module from current context
+    #@param fullname str : module fullname
+    @classmethod
+    def module(cls, fullname):
+        return cls.get().get_module(fullname)
+        
     ##@brief Expose leapi_dyncode module
     @classmethod
     def expose_dyncode(cls, globs, alias = 'leapi_dyncode'):
@@ -404,9 +420,15 @@ MONOSITE mode")
             raise ImportError(msg)
     
     ##@brief Implements LodelContext::expose_dyncode()
+    #@todo change hardcoded leapi_dyncode.py filename
     def _expose_dyncode(self, globs, alias = 'leapi_dyncode'):
-        sys.path.append(self.__instance_path)
-        dyncode = importlib.import_module('leapi_dyncode')
+        fullname = '%s.%s.dyncode' % (CTX_PKG, self.__id)
+        if fullname in sys.modules:
+            dyncode = sys.modules[fullname]
+        else:
+            path = os.path.join(self.__instance_path, 'leapi_dyncode.py')
+            sfl = importlib.machinery.SourceFileLoader(fullname, path)
+            dyncode = sfl.load_module()
         self.safe_exposure(globs, dyncode, alias)
     
     ##@brief Translate a module fullname to the context equivalent

lodel/plugin/core_hooks.py

@@ -40,7 +40,8 @@ def datasources_bootstrap_hook(hook_name, caller, payload):
 ##@brief Bootstrap hook that print debug infos about registered hooks
 @LodelHook('lodel2_bootstraped')
 def list_hook_debug_hook(name, caller, payload):
-    from lodel import logger
+    LodelContext.expose_modules(globals(), {
+        'lodel.logger': 'logger'})
     hlist = LodelHook.hook_list()
     for name, reg_hooks in hlist.items():
         for hook, priority in reg_hooks:
@@ -57,5 +58,6 @@ def list_hook_debug_hook(name, caller, payload):
 ##@brief Hooks that trigger custom methods injection in dynmic classes
 @LodelHook("lodel2_dyncode_loaded")
 def lodel2_plugins_custom_methods(self, caller, dynclasses):
-    from lodel.plugin.plugins import CustomMethod
+    LodelContext.expose_modules(globals(), {
+        'lodel.plugin.plugins': ['CustomMethod']})
     CustomMethod.set_registered(dynclasses)

lodel/plugin/hooks.py

@@ -2,7 +2,7 @@
 
 import os
 import copy
-from importlib.machinery import SourceFileLoader
+from lodel.context import LodelContext
 
 
 ##@brief Class designed to handle a hook's callback with a priority
@@ -64,7 +64,7 @@ class LodelHook(object):
     # @return modified payload
     @classmethod
     def call_hook(cls, hook_name, caller, payload):
-        from lodel import logger
+        LodelContext.expose_modules(globals(), {'lodel.logger': 'logger'})
         logger.info("Calling hook '%s'" % hook_name)
         if hook_name in cls._hooks:
             for hook in cls._hooks[hook_name]:

lodel/plugin/plugins.py

@@ -5,7 +5,7 @@ import os.path
 import importlib
 import copy
 import json
-from importlib.machinery import SourceFileLoader, SourcelessFileLoader
+from importlib.machinery import SourceFileLoader
 
 from lodel.context import LodelContext
 LodelContext.expose_modules(globals(), {
@@ -297,13 +297,7 @@ class Plugin(object, metaclass=MetaPlugType):
         # Importing __init__.py infos in it
         plugin_module = '%s.%s' % (VIRTUAL_PACKAGE_NAME,
                                     plugin_name)
-
-        init_source = os.path.join(self.path, INIT_FILENAME)
-        try:
-            loader = SourceFileLoader(plugin_module, init_source)
-            self.module = loader.load_module()
-        except (ImportError,FileNotFoundError) as e:
-             raise PluginError("Failed to load plugin '%s'. It seems that the plugin name is not valid or the plugin do not exists" % plugin_name)
+        self.module = LodelContext.module(plugin_module)
 
         # loading confspecs
         try:
@@ -397,11 +391,10 @@ name differ from the one found in plugin's init file"
                 fname = filename,
                 name = self.name)
             raise PluginError(msg)
-        # importing the file in varname
-        module_name = self.module.__name__+"."+varname
-        filename = os.path.join(self.path, filename)
-        loader = SourceFileLoader(module_name, filename)
-        return loader.load_module()
+        #extract module name from filename
+        base_mod = '.'.join(filename.split('.')[:-1])
+        module_name = self.module.__name__+"."+base_mod
+        return importlib.import_module(module_name)
    
     ##@brief Check dependencies of plugin
     #@return A list of plugin name to be loaded before
@@ -813,6 +806,7 @@ file : '%s'. Running discover again..." % DISCOVER_CACHE_FILENAME)
     ##@brief Import init file from a plugin path
     #@param path str : Directory path
     #@return a tuple (init_module, module_name)
+    #@todo very dirty, clean it
     @classmethod
     def import_init(cls, path):
         cls._mod_cnt += 1 # in order to ensure module name unicity

lodel/plugins/multisite/loader.py

@@ -58,6 +58,11 @@ for lodelsite_path in lodelsites_list:
     LodelHook.call_hook('lodel2_plugins_loaded', '__main__', None)
     #Next hook triggers call of interface's main loop
     LodelHook.call_hook('lodel2_bootstraped', '__main__', None)
+    #a dirty & quick attempt to fix context unwanted exite via
+    #hooks
+    for name in ( 'LodelHook', 'core_hooks', 'core_scripts',
+            'Settings', 'settings', 'logger', 'Plugin'):
+        del(globals()[name])
     #switch back to loader context
     LodelContext.set(None)
 

lodel/plugins/webui/interface/controllers/listing.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from lodel.context import LodelContext
 LodelContext.expose_modules(globals(), {'lodel.logger': 'logger'})
+LodelContext.expose_dyncode(globals(), 'dyncode')
 
 from .base import get_response
 from ...exceptions import *
-import leapi_dyncode as dyncode
 
 ##@brief These functions are called by the rules defined in ../urls.py
 ## To browse the editorial model

lodel/plugins/webui/interface/controllers/users.py

@@ -5,8 +5,7 @@ from ...client import WebUiClient as WebUiClient
 
 from lodel.context import LodelContext
 LodelContext.expose_modules(globals(), {'lodel.logger': 'logger'})
-
-import leapi_dyncode as dyncode #TODO : handle this with context
+LodelContext.expose_dyncode(globals(), 'dyncode')
 
 ##@brief These functions are called by the rules defined in ../urls.py
 ## Their goal is to handle the user authentication