paybox: PEP8, style, python3 (#41320)

This commit is contained in:
Benjamin Dauvergne 2020-04-04 12:28:13 +02:00
parent 8a9f36e522
commit 27bea9fce9
1 changed files with 31 additions and 29 deletions

View File

@ -22,7 +22,8 @@ import string
import warnings
from .common import (PaymentCommon, PaymentResponse, FORM, PAID, ERROR, Form,
ORDERID_TRANSACTION_SEPARATOR, ResponseError, force_text, force_byte)
ORDERID_TRANSACTION_SEPARATOR, ResponseError, force_text,
force_byte)
__all__ = ['sign', 'Payment']
@ -182,41 +183,41 @@ class Payment(PaymentCommon):
'name': 'platform',
'caption': _('Plateforme cible'),
'default': 'test',
'validation': lambda x: isinstance(x, basestring) and
x.lower() in ('test', 'prod'),
'validation': lambda x: isinstance(x, six.string_types)
and x.lower() in ('test', 'prod'),
},
{
'name': 'site',
'caption': _('Numéro de site'),
'required': True,
'validation': lambda x: isinstance(x, basestring) and
x.isdigit() and len(x) == 7,
'validation': lambda x: isinstance(x, six.string_types)
and x.isdigit() and len(x) == 7,
},
{
'name': 'cle',
'caption': _('Site key'),
'required': False,
'validation': lambda x: isinstance(x, basestring),
'validation': lambda x: isinstance(x, six.string_types),
},
{
'name': 'rang',
'caption': _('Numéro de rang'),
'required': True,
'validation': lambda x: isinstance(x, basestring) and
x.isdigit() and len(x) == 2,
'validation': lambda x: isinstance(x, six.string_types)
and x.isdigit() and len(x) == 2,
},
{
'name': 'identifiant',
'caption': _('Identifiant'),
'required': True,
'validation': lambda x: isinstance(x, basestring) and
x.isdigit() and (0 < len(x) < 10),
'validation': lambda x: isinstance(x, six.string_types)
and x.isdigit() and (0 < len(x) < 10),
},
{
'name': 'shared_secret',
'caption': _('Secret partagé'),
'validation': lambda x: isinstance(x, str) and
all(a.lower() in '0123456789ABCDEF' for a in x),
'validation': lambda x: isinstance(x, str)
and all(a.lower() in '0123456789ABCDEF' for a in x),
'required': True,
},
{
@ -237,8 +238,8 @@ class Payment(PaymentCommon):
'caption': _('Nombre de jours pour un paiement différé'),
'default': '',
'required': False,
'validation': lambda x: isinstance(x, basestring) and
x.isdigit() and (1 <= len(x) <= 2)
'validation': lambda x: isinstance(x, six.string_types)
and x.isdigit() and (1 <= len(x) <= 2)
},
{
'name': 'capture_mode',
@ -339,7 +340,7 @@ class Payment(PaymentCommon):
result = ERROR
for l in (5, 3):
prefix = d['erreur'][0][:l]
suffix = 'x' * (5-l)
suffix = 'x' * (5 - l)
bank_status = PAYBOX_ERROR_CODES.get(prefix + suffix)
if bank_status is not None:
break
@ -357,7 +358,8 @@ class Payment(PaymentCommon):
def perform(self, amount, bank_data, operation):
logger = logging.getLogger(__name__)
url = PAYBOX_DIRECT_URLS[self.platform]
params = {'VERSION': PAYBOX_DIRECT_VERSION_NUMBER,
params = {
'VERSION': PAYBOX_DIRECT_VERSION_NUMBER,
'TYPE': operation,
'SITE': force_text(self.site),
'RANG': self.rang.strip(),