From ee846bd5ed41de49bb1739cd27940538f9c8a4cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Tue, 21 Apr 2015 16:38:30 +0200
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(-)

diff --git a/eopayment/__init__.py b/eopayment/__init__.py
index 711e6c9..2d47bf1 100644
--- a/eopayment/__init__.py
+++ b/eopayment/__init__.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from common import URL, HTML, FORM, RECEIVED, ACCEPTED, PAID, DENIED, CANCELED, ERROR
+from common import URL, HTML, FORM, RECEIVED, ACCEPTED, PAID, DENIED, CANCELED, CANCELLED, ERROR
 
 __all__ = ['Payment', 'URL', 'HTML', 'FORM', '__version__', 'SIPS',
 'SYSTEMPAY', 'SPPLUS', 'TIPI', 'DUMMY', 'get_backend', 'RECEIVED', 'ACCEPTED',
-'PAID', 'DENIED', 'CANCELED', 'ERROR', 'get_backends']
+'PAID', 'DENIED', 'CANCELED', 'CANCELLED', 'ERROR', 'get_backends']
 
 __version__ = "0.0.22"
 
diff --git a/eopayment/common.py b/eopayment/common.py
index 282900c..75d72c8 100644
--- a/eopayment/common.py
+++ b/eopayment/common.py
@@ -19,7 +19,8 @@ RECEIVED = 1
 ACCEPTED = 2
 PAID = 3
 DENIED = 4
-CANCELED = 5
+CANCELLED = 5
+CANCELED = 5 # typo for backward compatibility
 ERROR = 99
 
 
diff --git a/eopayment/ogone.py b/eopayment/ogone.py
index 1806214..4ccb2f9 100644
--- a/eopayment/ogone.py
+++ b/eopayment/ogone.py
@@ -4,7 +4,7 @@ import string
 import urlparse
 from decimal import Decimal, ROUND_HALF_UP
 
-from common import (PaymentCommon, PaymentResponse, FORM, CANCELED, PAID,
+from common import (PaymentCommon, PaymentResponse, FORM, CANCELLED, PAID,
         ERROR, Form, DENIED, ACCEPTED)
 def N_(message): return message
 
@@ -521,7 +521,7 @@ class Payment(PaymentCommon):
             print 'signed', signature
             print 'expected', expected_signature
         if status == '1':
-            result = CANCELED
+            result = CANCELLED
         elif status == '2':
             result = DENIED
         elif status == '5':
diff --git a/eopayment/tipi.py b/eopayment/tipi.py
index 6d4ffb1..3372efe 100644
--- a/eopayment/tipi.py
+++ b/eopayment/tipi.py
@@ -2,7 +2,7 @@
 
 from decimal import Decimal, ROUND_DOWN
 from common import (PaymentCommon, PaymentResponse, URL, PAID, DENIED,
-        CANCELED, ERROR)
+        CANCELLED, ERROR)
 from urllib import urlencode
 from urlparse import parse_qs
 from gettext import gettext as _
@@ -142,7 +142,7 @@ class Payment(PaymentCommon):
             result = DENIED
             bank_status = 'refused'
         elif result == 'A':
-            result = CANCELED
+            result = CANCELLED
             bank_status = 'canceled'
         else:
             bank_status = 'wrong return: %r' % result