Deal with credit card numbers that include - and spaces

limnick · Jul 20, 2010 · 08acb91 · 08acb91
1 parent c8a3e88
commit 08acb91
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/paypal/pro/creditcard.py b/paypal/pro/creditcard.py
@@ -12,8 +12,8 @@
 # Well known card regular expressions.
 CARDS = {
     'Visa': re.compile(r"^4\d{12}(\d{3})?$"),
-    'Mastercard': re.compile(r"(5[1-5]\d{4}|677189)\d{10}$"),
-    'Dinersclub': re.compile(r"^3(0[0-5]|[68]\d)\d{11}"),
+    'Mastercard': re.compile(r"^(5[1-5]\d{4}|677189)\d{10}$"),
+    'Dinersclub': re.compile(r"^3(0[0-5]|[68]\d)\d{11}$"),
     'Amex': re.compile("^3[47]\d{13}$"),
     'Discover': re.compile("^(6011|65\d{2})\d{12}$"),
 }

diff --git a/paypal/pro/fields.py b/paypal/pro/fields.py
@@ -19,6 +19,7 @@ def __init__(self, *args, **kwargs):
     def clean(self, value):
         """Raises a ValidationError if the card is not valid and stashes card type."""
         if value:
+            value = value.replace('-', '').replace(' ', '')
             self.card_type = verify_credit_card(value)
             if self.card_type is None:
                 raise forms.ValidationError("Invalid credit card number.")

diff --git a/paypal/pro/tests.py b/paypal/pro/tests.py
@@ -45,12 +45,14 @@ class DummyPayPalWPP(PayPalWPP):
 
 
 class CreditCardFieldTest(TestCase):
-    def testCreditCardField(self):
+    def test_CreditCardField(self):
         field = CreditCardField()
         field.clean('4797503429879309')
         self.assertEquals(field.card_type, "Visa")
         self.assertRaises(ValidationError, CreditCardField().clean, '1234567890123455')
 
+    def test_invalidCreditCards(self):
+        self.assertEquals(CreditCardField().clean('4797-5034-2987-9309'), '4797503429879309')
 
 class PayPalWPPTest(TestCase):
     def setUp(self):
@@ -92,7 +94,7 @@ def test_doDirectPayment_valid(self):
             'ipaddress': '10.0.1.199',}
         data.update(self.item)
         self.assertTrue(self.wpp.doDirectPayment(data))
-        
+
     def test_doDirectPayment_invalid(self):
         data = {
             'firstname': 'Epic',