From be1444baa91c53434159f8c49568d71dcc15bb6c Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sun, 2 Oct 2016 23:21:20 +0200 Subject: [PATCH] FIX _logger is now really available for the except --- base_phone/base_phone.py | 7 ++++--- base_phone/report_sxw_format.py | 6 +++++- base_phone/wizard/number_not_found.py | 7 ++++--- crm_phone/wizard/create_crm_phonecall.py | 6 +++++- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/base_phone/base_phone.py b/base_phone/base_phone.py index f863651..afd95d5 100644 --- a/base_phone/base_phone.py +++ b/base_phone/base_phone.py @@ -23,13 +23,14 @@ from openerp import models, fields, api, _ from openerp.tools.safe_eval import safe_eval from openerp.exceptions import Warning import logging + +_logger = logging.getLogger(__name__) + # Lib for phone number reformating -> pip install phonenumbers try: import phonenumbers except ImportError: - logger.debug('Cannot import phonenumbers') - -_logger = logging.getLogger(__name__) + _logger.debug('Cannot import phonenumbers') class PhoneCommon(models.AbstractModel): diff --git a/base_phone/report_sxw_format.py b/base_phone/report_sxw_format.py index 1349625..0ac0d30 100644 --- a/base_phone/report_sxw_format.py +++ b/base_phone/report_sxw_format.py @@ -21,10 +21,14 @@ from openerp.osv import orm from openerp.report import report_sxw +import logging + +_logger = logging.getLogger(__name__) + try: import phonenumbers except ImportError: - logger.debug('Cannot import phonenumbers') + _logger.debug('Cannot import phonenumbers') class base_phone_installed(orm.AbstractModel): diff --git a/base_phone/wizard/number_not_found.py b/base_phone/wizard/number_not_found.py index a128154..7c49f79 100644 --- a/base_phone/wizard/number_not_found.py +++ b/base_phone/wizard/number_not_found.py @@ -22,12 +22,13 @@ from openerp.osv import orm, fields from openerp.tools.translate import _ import logging + +_logger = logging.getLogger(__name__) + try: import phonenumbers except ImportError: - logger.debug('Cannot import phonenumbers') - -_logger = logging.getLogger(__name__) + _logger.debug('Cannot import phonenumbers') class number_not_found(orm.TransientModel): diff --git a/crm_phone/wizard/create_crm_phonecall.py b/crm_phone/wizard/create_crm_phonecall.py index 7100ef4..e43f76b 100644 --- a/crm_phone/wizard/create_crm_phonecall.py +++ b/crm_phone/wizard/create_crm_phonecall.py @@ -21,10 +21,14 @@ ############################################################################## from openerp import models, api, _ +import logging + +_logger = logging.getLogger(__name__) + try: import phonenumbers except ImportError: - logger.debug('Cannot import phonenumbers') + _logger.debug('Cannot import phonenumbers') class wizard_create_crm_phonecall(models.TransientModel):