Merge pull request #2009 from john-parton/issue/2008/expirymonth_attribute_error

Allow BankcardExpiryMonthField to have required=False

src/oscar/apps/payment/forms.py

@@ -133,7 +133,7 @@ class BankcardExpiryMonthField(BankcardMonthField):
 
     def clean(self, value):
         expiry_date = super(BankcardExpiryMonthField, self).clean(value)
-        if date.today() > expiry_date:
+        if expiry_date and date.today() > expiry_date:
             raise forms.ValidationError(
                 _("The expiration date you entered is in the past."))
         return expiry_date

tests/unit/payment/form_tests.py

@@ -102,6 +102,15 @@ class TestExpiryMonthField(TestCase):
                           self.field.initial)
 
 
+class TestOptionalExpiryMonthField(TestExpiryMonthField):
+
+    def setUp(self):
+        self.field = forms.BankcardExpiryMonthField(required=False)
+
+    def test_accepts_none(self):
+        self.field.clean(None)
+
+
 class TestCCVField(TestCase):
     """CCV field"""