Browse Source

drop Form/ModelForm from misago.core.forms

Rafał Pitoń 9 years ago
parent
commit
bcbc195eb7
3 changed files with 2 additions and 42 deletions
  1. 1 22
      misago/core/forms.py
  2. 0 19
      misago/core/tests/test_forms.py
  3. 1 1
      misago/users/forms/auth.py

+ 1 - 22
misago/core/forms.py

@@ -3,20 +3,11 @@ from datetime import datetime, timedelta
 from mptt.forms import *  # noqa
 
 from django.forms import *  # noqa
-from django.forms import Form as BaseForm, ModelForm as BaseModelForm
 from django.utils import timezone
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 
 
-TEXT_BASED_FIELDS = (
-    CharField, EmailField, FilePathField, URLField
-)
-
-
-"""
-Fields
-"""
 class YesNoSwitchBase(TypedChoiceField):
     def prepare_value(self, value):
         """normalize bools to binary 1/0 so field works on them too"""
@@ -79,8 +70,7 @@ class IsoDateTimeField(DateTimeField):
             local_date = self.strptime(value)
 
             if offset and offset[0] in ('-', '+'):
-                tz_offset = timedelta(hours=int(offset[1:3]),
-                                      minutes=int(offset[4:6]))
+                tz_offset = timedelta(hours=int(offset[1:3]), minutes=int(offset[4:6]))
                 tz_offset = tz_offset.seconds // 60
                 if offset[0] == '-':
                     tz_offset *= -1
@@ -92,14 +82,3 @@ class IsoDateTimeField(DateTimeField):
         except (IndexError, TypeError, ValueError) as e:
             raise ValidationError(
                 self.error_messages['invalid'], code='invalid')
-
-
-"""
-Forms
-"""
-class Form(BaseForm):
-    pass
-
-
-class ModelForm(BaseModelForm):
-    pass

+ 0 - 19
misago/core/tests/test_forms.py

@@ -2,25 +2,6 @@ from django.test import TestCase
 from misago.core import forms
 
 
-class MockForm(forms.Form):
-    stripme = forms.CharField(required=False)
-    dontstripme = forms.CharField(required=False, strip=False)
-
-
-class MisagoFormsTests(TestCase):
-    def test_stripme_input_is_autostripped(self):
-        """Automatic strip worked on stripme input"""
-        form = MockForm({'stripme': u' Ni! '})
-        form.full_clean()
-        self.assertEqual(form.cleaned_data['stripme'], 'Ni!')
-
-    def test_dontstripme_input_is_ignored(self):
-        """Automatic strip ignored dontstripme input"""
-        form = MockForm({'dontstripme': u' Ni! '})
-        form.full_clean()
-        self.assertEqual(form.cleaned_data['dontstripme'], ' Ni! ')
-
-
 class YesNoForm(forms.Form):
     test_field = forms.YesNoSwitch(label='Hello!')
 

+ 1 - 1
misago/users/forms/auth.py

@@ -53,7 +53,7 @@ class MisagoAuthMixin(object):
         }
 
 
-class AuthenticationForm(MisagoAuthMixin, forms.Form, BaseAuthenticationForm):
+class AuthenticationForm(MisagoAuthMixin, BaseAuthenticationForm):
     """
     Base class for authenticating users, Floppy-forms and
     Misago login field comliant