summaryrefslogtreecommitdiff
path: root/django/contrib/admin/options.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/contrib/admin/options.py')
-rw-r--r--django/contrib/admin/options.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 07f29acbf0..082d3b3847 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -143,12 +143,6 @@ class BaseModelAdmin(object):
radio_fields = {}
prepopulated_fields = {}
- def __init__(self):
- # TODO: This should really go in django.core.validation, but validation
- # doesn't work on ModelAdmin classes yet.
- if self.fieldsets and self.fields:
- raise ImproperlyConfigured('Both fieldsets and fields is specified for %s.' % self.model)
-
def formfield_for_dbfield(self, db_field, **kwargs):
"""
Hook for specifying the form Field instance for a given database Field