except:
logger.log_exc("Cannot locate generic instance with flavour=%s"%flavour)
+ # provide default for importer_class
+ def importer_class (self):
+ return None
+
# in the simplest case these can be redefined to the class/module objects to be used
# see pl.py for an example
# some descendant of SfaApi
if not 'interface' in kwargs:
logger.critical("Generic.make_api: no interface found")
api = self.api_class()(*args, **kwargs)
- manager = self.make_manager(api.interface)
- driver = self.make_driver (api.config, api.interface)
+ # xxx can probably drop support for managers implemented as modules
+ # which makes it a bit awkward
+ manager_class_or_module = self.make_manager(api.interface)
+ driver = self.make_driver (api)
### arrange stuff together
# add a manager wrapper
- manager_wrap = ManagerWrapper(manager,api.interface)
+ manager_wrap = ManagerWrapper(manager_class_or_module,api.interface,api.config)
api.manager=manager_wrap
- # insert driver in manager
- logger.debug("Setting manager.driver, manager=%s"%manager)
- manager.driver=driver
- # add it in api as well for convenience
+ # add it in api as well; driver.api is set too as part of make_driver
api.driver=driver
return api
logger.log_exc_critical(message)
# need interface to select the right driver
- def make_driver (self, config, interface):
+ def make_driver (self, api):
+ config=api.config
+ interface=api.interface
flavour = self.flavour
message="Generic.make_driver for flavour=%s and interface=%s"%(flavour,interface)
try:
class_obj = getattr(self,classname)()
logger.debug("%s : %s"%(message,class_obj))
- return class_obj(config)
+ return class_obj(api)
except:
logger.log_exc_critical(message)
-