From 1defd73f9b8d4f4347646335e58645c36aba518b Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 5 Mar 2015 16:21:40 +0100 Subject: [PATCH] Remove default logger on payment methods, build it based on the real class module --- eopayment/__init__.py | 9 ++------- eopayment/common.py | 7 +++---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/eopayment/__init__.py b/eopayment/__init__.py index aaeea65..d00d1f5 100644 --- a/eopayment/__init__.py +++ b/eopayment/__init__.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- -import logging - from common import URL, HTML __all__ = ['Payment', 'URL', 'HTML', '__version__', 'SIPS', 'SYSTEMPAY', @@ -9,8 +7,6 @@ __all__ = ['Payment', 'URL', 'HTML', '__version__', 'SIPS', 'SYSTEMPAY', __version__ = "0.0.22" -LOGGER = logging.getLogger(__name__) - SIPS = 'sips' SYSTEMPAY = 'systempayv2' SPPLUS = 'spplus' @@ -66,10 +62,9 @@ class Payment(object): ''' - def __init__(self, kind, options, logger=LOGGER): - self.logger = logger + def __init__(self, kind, options): self.kind = kind - self.backend = get_backend(kind)(options, logger=logger) + self.backend = get_backend(kind)(options) def request(self, amount, **kwargs): '''Request a payment to the payment backend. diff --git a/eopayment/common.py b/eopayment/common.py index e8b97d7..2726ac8 100644 --- a/eopayment/common.py +++ b/eopayment/common.py @@ -8,7 +8,6 @@ __all__ = ['PaymentCommon', 'URL', 'HTML', 'RANDOM', 'RECEIVED', 'ACCEPTED', 'PAID', 'ERROR'] -LOGGER = logging.getLogger(__name__) RANDOM = random.SystemRandom() URL = 1 @@ -75,9 +74,9 @@ class PaymentCommon(object): PATH = '/tmp' BANK_ID = '__bank_id' - def __init__(self, options, logger=LOGGER): - self.logger = logger - logger.debug('initializing with options %s' % options) + def __init__(self, options): + self.logger = logging.getLogger(self.__class__.__module__) + self.logger.debug('initializing with options %s', options) for value in self.description['parameters']: key = value['name'] if 'default' in value: