It seems like some stuff changed in django, not sure what exactly. This
commit removes changes the inheritance to inherit from Form and
ModelForm instead of avoiding that and directly inheriting from their
base classes and do some metaclass magic.
# Mostly based on code from Amelie, a project by Inter-Actief.
from django.forms.util import ErrorList
# Mostly based on code from Amelie, a project by Inter-Actief.
from django.forms.util import ErrorList
-from django.forms.models import BaseModelForm, ModelFormMetaclass
-from django.forms.forms import BaseForm, DeclarativeFieldsMetaclass
+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
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
data = request.POST
if not files:
files = request.FILES
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)
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
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
data = request.POST
if not files:
files = request.FILES
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)
error_class, label_suffix, instance)
-class ContextModelForm(BaseContextModelForm):
- __metaclass__ = ModelFormMetaclass
# vim: set sts=4 sw=4 expandtab:
# vim: set sts=4 sw=4 expandtab: