X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=tools%2Fforms.py;h=db65a99c43da663820675de8aa2aff76b9f83f1f;hb=HEAD;hp=b420e1f637a0c1a750b21995f2ab09e935ab5981;hpb=f1833394374f434a61ab1ab9a551f2bded207182;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/tools/forms.py b/tools/forms.py
index b420e1f..db65a99 100644
--- a/tools/forms.py
+++ b/tools/forms.py
@@ -1,10 +1,10 @@
 # Mostly based on code from Amelie, a project by Inter-Actief.
 
-from django.newforms.util import ErrorList
-from django.newforms.models import BaseModelForm, ModelFormMetaclass
-from django.newforms.forms import BaseForm, DeclarativeFieldsMetaclass
+from django.forms.util import ErrorList
+from django.forms.models import ModelForm
+from django.forms.forms import Form
 
-class BaseContextForm(BaseForm):
+class ContextForm(Form):
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
                  initial=None, request=None, error_class=ErrorList, label_suffix=':'):
         self.request = request
@@ -13,13 +13,10 @@ class BaseContextForm(BaseForm):
                 data = request.POST
             if not files:
                 files = request.FILES
-        super(BaseContextForm, self).__init__(data, files, auto_id, prefix,
+        super(ContextForm, self).__init__(data, files, auto_id, prefix,
                                        initial, request, error_class, label_suffix)
 
-class ContextForm(BaseContextForm):
-    __metaclass__ = DeclarativeFieldsMetaclass
-
-class BaseContextModelForm(BaseModelForm):
+class ContextModelForm(ModelForm):
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
                  initial=None, request=None, error_class=ErrorList, label_suffix=':', instance=None):
         self.request = request
@@ -28,10 +25,8 @@ class BaseContextModelForm(BaseModelForm):
                 data = request.POST
             if not files:
                 files = request.FILES
-        super(BaseContextModelForm, self).__init__(data, files, auto_id, prefix, initial, 
+        super(ContextModelForm, self).__init__(data, files, auto_id, prefix, initial, 
                                             error_class, label_suffix, instance)
 
-class ContextModelForm(BaseContextModelForm):
-    __metaclass__ = ModelFormMetaclass
 
 # vim: set sts=4 sw=4 expandtab: