Projet

Général

Profil

0001-fix-CANCELLED-constant-name-keep-typo-for-backward-c.patch

Frédéric Péters, 21 avril 2015 16:40

Télécharger (2,87 ko)

Voir les différences: 

Subject: [PATCH] fix CANCELLED constant name, keep typo for backward
 compatibility (#7006)


 eopayment/__init__.py | 4 ++--
 eopayment/common.py   | 3 ++-
 eopayment/ogone.py    | 4 ++--
 eopayment/tipi.py     | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)
eopayment/__init__.py
1 1 
# -*- coding: utf-8 -*-
2 2 

  		




  3
  
  
    
from common import URL, HTML, FORM, RECEIVED, ACCEPTED, PAID, DENIED, CANCELED, ERROR

  		




  
  3
  
    
from common import URL, HTML, FORM, RECEIVED, ACCEPTED, PAID, DENIED, CANCELED, CANCELLED, ERROR

  		




  4
  4
  
    

  		




  5
  5
  
    
__all__ = ['Payment', 'URL', 'HTML', 'FORM', '__version__', 'SIPS',

  		




  6
  6
  
    
'SYSTEMPAY', 'SPPLUS', 'TIPI', 'DUMMY', 'get_backend', 'RECEIVED', 'ACCEPTED',

  		




  7
  
  
    
'PAID', 'DENIED', 'CANCELED', 'ERROR', 'get_backends']

  		




  
  7
  
    
'PAID', 'DENIED', 'CANCELED', 'CANCELLED', 'ERROR', 'get_backends']

  		




  8
  8
  
    

  		




  9
  9
  
    
__version__ = "0.0.22"

  		




  10
  10
  
    

  		












  

    
      eopayment/common.py
    
  





  19
  19
  
    
ACCEPTED = 2

  		




  20
  20
  
    
PAID = 3

  		




  21
  21
  
    
DENIED = 4

  		




  22
  
  
    
CANCELED = 5

  		




  
  22
  
    
CANCELLED = 5

  		




  
  23
  
    
CANCELED = 5 # typo for backward compatibility

  		




  23
  24
  
    
ERROR = 99

  		




  24
  25
  
    

  		




  25
  26
  
    

  		












  

    
      eopayment/ogone.py
    
  





  4
  4
  
    
import urlparse

  		




  5
  5
  
    
from decimal import Decimal, ROUND_HALF_UP

  		




  6
  6
  
    

  		




  7
  
  
    
from common import (PaymentCommon, PaymentResponse, FORM, CANCELED, PAID,

  		




  
  7
  
    
from common import (PaymentCommon, PaymentResponse, FORM, CANCELLED, PAID,

  		




  8
  8
  
    
        ERROR, Form, DENIED, ACCEPTED)

  		




  9
  9
  
    
def N_(message): return message

  		




  10
  10
  
    

  		




  ......




  521
  521
  
    
            print 'signed', signature

  		




  522
  522
  
    
            print 'expected', expected_signature

  		




  523
  523
  
    
        if status == '1':

  		




  524
  
  
    
            result = CANCELED

  		




  
  524
  
    
            result = CANCELLED

  		




  525
  525
  
    
        elif status == '2':

  		




  526
  526
  
    
            result = DENIED

  		




  527
  527
  
    
        elif status == '5':

  		












  

    
      eopayment/tipi.py
    
  





  2
  2
  
    

  		




  3
  3
  
    
from decimal import Decimal, ROUND_DOWN

  		




  4
  4
  
    
from common import (PaymentCommon, PaymentResponse, URL, PAID, DENIED,

  		




  5
  
  
    
        CANCELED, ERROR)

  		




  
  5
  
    
        CANCELLED, ERROR)

  		




  6
  6
  
    
from urllib import urlencode

  		




  7
  7
  
    
from urlparse import parse_qs

  		




  8
  8
  
    
from gettext import gettext as _

  		




  ......




  142
  142
  
    
            result = DENIED

  		




  143
  143
  
    
            bank_status = 'refused'

  		




  144
  144
  
    
        elif result == 'A':

  		




  145
  
  
    
            result = CANCELED

  		




  
  145
  
    
            result = CANCELLED

  		




  146
  146
  
    
            bank_status = 'canceled'

  		




  147
  147
  
    
        else:

  		




  148
  148
  
    
            bank_status = 'wrong return: %r' % result

  		




  149
  
  
    
-