git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into senslab2
[sfa.git]
/
sfa
/
generic
/
__init__.py
diff --git
a/sfa/generic/__init__.py
b/sfa/generic/__init__.py
index
6ea2e89
..
de1a9e1
100644
(file)
--- a/
sfa/generic/__init__.py
+++ b/
sfa/generic/__init__.py
@@
-35,7
+35,7
@@
class Generic:
#mixed = flavour.capitalize()
module_path="sfa.generic.%s"%flavour
classname="%s"%flavour
#mixed = flavour.capitalize()
module_path="sfa.generic.%s"%flavour
classname="%s"%flavour
- logger.
info
("Generic.the_flavour with flavour=%s"%flavour)
+ logger.
debug
("Generic.the_flavour with flavour=%s"%flavour)
try:
module = __import__ (module_path, globals(), locals(), [classname])
return getattr(module, classname)(flavour,config)
try:
module = __import__ (module_path, globals(), locals(), [classname])
return getattr(module, classname)(flavour,config)
@@
-60,15
+60,18
@@
class Generic:
if not 'interface' in kwargs:
logger.critical("Generic.make_api: no interface found")
api = self.api_class()(*args, **kwargs)
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)
+ # 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.config, api.interface)
### arrange stuff together
# add a manager wrapper
driver = self.make_driver (api.config, api.interface)
### 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
api.manager=manager_wrap
# insert driver in manager
- logger.info("Setting manager.driver, manager=%s"%manager)
- manager.driver=driver
+ logger.debug("Setting manager.driver, manager=%s"%manager_class_or_module)
+ # xxx this should go into the object and not the class !?!
+ manager_class_or_module.driver=driver
# add it in api as well for convenience
api.driver=driver
return api
# add it in api as well for convenience
api.driver=driver
return api