Projet

Général

Profil

0001-general-give-same-signature-to-all-Payment-object-co.patch

Frédéric Péters, 18 février 2016 16:06

Télécharger (4,07 ko)

Voir les différences: 

Subject: [PATCH] general: give same signature to all Payment object
 constructors (#10030)


 eopayment/__init__.py    | 4 ++--
 eopayment/common.py      | 4 ++--
 eopayment/sips.py        | 4 ++--
 eopayment/sips2.py       | 3 ---
 eopayment/systempayv2.py | 5 +----
 eopayment/tipi.py        | 5 -----
 6 files changed, 7 insertions(+), 18 deletions(-)
eopayment/__init__.py
75 75 

  		




  76
  76
  
    
    '''

  		




  77
  77
  
    

  		




  78
  
  
    
    def __init__(self, kind, options):

  		




  
  78
  
    
    def __init__(self, kind, options, logger=None):

  		




  79
  79
  
    
        self.kind = kind

  		




  80
  
  
    
        self.backend = get_backend(kind)(options)

  		




  
  80
  
    
        self.backend = get_backend(kind)(options, logger=logger)

  		




  81
  81
  
    

  		




  82
  82
  
    
    def request(self, amount, **kwargs):

  		




  83
  83
  
    
        '''Request a payment to the payment backend.

  		












  

    
      eopayment/common.py
    
  





  83
  83
  
    
    PATH = '/tmp'

  		




  84
  84
  
    
    BANK_ID = '__bank_id'

  		




  85
  85
  
    

  		




  86
  
  
    
    def __init__(self, options):

  		




  87
  
  
    
        self.logger = logging.getLogger(self.__class__.__module__)

  		




  
  86
  
    
    def __init__(self, options, logger=None):

  		




  
  87
  
    
        self.logger = logger or logging.getLogger(self.__class__.__module__)

  		




  88
  88
  
    
        self.logger.debug('initializing with options %s', options)

  		




  89
  89
  
    
        for value in self.description['parameters']:

  		




  90
  90
  
    
            key = value['name']

  		












  

    
      eopayment/sips.py
    
  





  102
  102
  
    
            ],

  		




  103
  103
  
    
    }

  		




  104
  104
  
    

  		




  105
  
  
    
    def __init__(self, options, logger=LOGGER):

  		




  
  105
  
    
    def __init__(self, options, logger=None):

  		




  
  106
  
    
        super(Payment, self).__init__(options, logger=logger)

  		




  106
  107
  
    
        self.options = options

  		




  107
  108
  
    
        self.binpath = self.options.pop(BINPATH)

  		




  108
  
  
    
        self.logger = logger

  		




  109
  109
  
    
        self.logger.debug('initializing sips payment class with %s' % options)

  		




  110
  110
  
    

  		




  111
  111
  
    
    def execute(self, executable, params):

  		












  

    
      eopayment/sips2.py
    
  





  112
  112
  
    
        ],

  		




  113
  113
  
    
    }

  		




  114
  114
  
    

  		




  115
  
  
    
    def __init__(self, options, logger=None):

  		




  116
  
  
    
        super(Payment, self).__init__(options)

  		




  117
  
  
    

  		




  118
  115
  
    
    def encode_data(self, data):

  		




  119
  116
  
    
        return u'|'.join(u'%s=%s' % (unicode(key), unicode(value))

  		




  120
  117
  
    
                         for key, value in data.iteritems())

  		












  

    
      eopayment/systempayv2.py
    
  





  256
  256
  
    
        description['parameters'].append(x)

  		




  257
  257
  
    

  		




  258
  258
  
    
    def __init__(self, options, logger=None):

  		




  259
  
  
    
        self.service_url = options.pop('service_url', self.service_url)

  		




  260
  
  
    
        self.secret_test = options.pop('secret_test')

  		




  261
  
  
    
        self.secret_production = options.pop('secret_production', None)

  		




  
  259
  
    
        super(Payment, self).__init__(options, logger=logger)

  		




  262
  260
  
    
        options = add_vads(options)

  		




  263
  261
  
    
        self.options = options

  		




  264
  
  
    
        self.logger = logger or logging.getLogger(__name__)

  		




  265
  262
  
    

  		




  266
  263
  
    
    def request(self, amount, name=None, address=None, email=None, phone=None,

  		




  267
  264
  
    
                orderid=None, info1=None, info2=None, info3=None,

  		












  

    
      eopayment/tipi.py
    
  





  54
  54
  
    
            ],

  		




  55
  55
  
    
    }

  		




  56
  56
  
    

  		




  57
  
  
    
    def __init__(self, options, logger=LOGGER):

  		




  58
  
  
    
        self.service_url = options.pop('service_url', TIPI_URL)

  		




  59
  
  
    
        self.numcli = options.pop('numcli', '')

  		




  60
  
  
    
        self.logger = logger

  		




  61
  
  
    

  		




  62
  57
  
    
    def request(self, amount, next_url=None, exer=None, orderid=None,

  		




  63
  58
  
    
            refdet=None, objet=None, email=None, saisie=None, **kwargs):

  		




  64
  59
  
    
        try:

  		




  65
  
  
    
-