odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] res_config: changed from class __logger to module _logger. 

bzr revid: vmt@openerp.com-20120124162804-9t4y7gy1bvc7jql3
This commit is contained in:
Vo Minh Thu 2012-01-24 17:28:04 +01:00
parent 48adfc8ff3
commit 402bddc06a
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openerp/addons/base/res/res_config.py
View File

@ -27,6 +27,7 @@ import netsvc
from tools import ustr from tools import ustr
import pooler import pooler
_logger = logging.getLogger(__name__)
class res_config_configurable(osv.osv_memory): class res_config_configurable(osv.osv_memory):
''' Base classes for new-style configuration items ''' Base classes for new-style configuration items
@ -37,11 +38,10 @@ class res_config_configurable(osv.osv_memory):
''' '''
_name = 'res.config' _name = 'res.config'
_inherit = 'ir.wizard.screen' _inherit = 'ir.wizard.screen'
__logger = logging.getLogger(_name)
def _next_action(self, cr, uid, context=None): def _next_action(self, cr, uid, context=None):
Todos = self.pool['ir.actions.todo'] Todos = self.pool['ir.actions.todo']
self.__logger.info('getting next %s', Todos) _logger.info('getting next %s', Todos)
active_todos = Todos.browse(cr, uid, active_todos = Todos.browse(cr, uid,
Todos.search(cr, uid, ['&', ('type', '=', 'automatic'), ('state','=','open')]), Todos.search(cr, uid, ['&', ('type', '=', 'automatic'), ('state','=','open')]),
@ -63,9 +63,9 @@ class res_config_configurable(osv.osv_memory):
return None return None
def _next(self, cr, uid, context=None): def _next(self, cr, uid, context=None):
self.__logger.info('getting next operation') _logger.info('getting next operation')
next = self._next_action(cr, uid, context=context) next = self._next_action(cr, uid, context=context)
self.__logger.info('next action is %s', next) _logger.info('next action is %s', next)
if next: if next:
res = next.action_launch(context=context) res = next.action_launch(context=context)
res['nodestroy'] = False res['nodestroy'] = False
@ -244,7 +244,6 @@ class res_config_installer(osv.osv_memory):
""" """
_name = 'res.config.installer' _name = 'res.config.installer'
_inherit = 'res.config' _inherit = 'res.config'
__logger = logging.getLogger(_name)
_install_if = {} _install_if = {}
@ -352,7 +351,7 @@ class res_config_installer(osv.osv_memory):
modules = self.pool.get('ir.module.module') modules = self.pool.get('ir.module.module')
to_install = list(self.modules_to_install( to_install = list(self.modules_to_install(
cr, uid, ids, context=context)) cr, uid, ids, context=context))
self.__logger.info('Selecting addons %s to install', to_install) _logger.info('Selecting addons %s to install', to_install)
modules.state_update( modules.state_update(
cr, uid, cr, uid,
modules.search(cr, uid, [('name','in',to_install)]), modules.search(cr, uid, [('name','in',to_install)]),
@ -374,7 +373,6 @@ class ir_actions_configuration_wizard(osv.osv_memory):
''' '''
_name='ir.actions.configuration.wizard' _name='ir.actions.configuration.wizard'
_inherit = 'res.config' _inherit = 'res.config'
__logger = logging.getLogger(_name)
def _next_action_note(self, cr, uid, ids, context=None): def _next_action_note(self, cr, uid, ids, context=None):
next = self._next_action(cr, uid) next = self._next_action(cr, uid)
@ -394,7 +392,7 @@ class ir_actions_configuration_wizard(osv.osv_memory):
} }
def execute(self, cr, uid, ids, context=None): def execute(self, cr, uid, ids, context=None):
self.__logger.warn(DEPRECATION_MESSAGE) _logger.warn(DEPRECATION_MESSAGE)
ir_actions_configuration_wizard() ir_actions_configuration_wizard()