summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2011-08-23 04:05:47 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2011-08-23 04:05:47 +0000
commit1f770c62da69866835bb8fc9355128b6b493a97e (patch)
tree99233408712c72884aaa8adfe6b3d4f2f12dcd12
parent6cd90236350b6531122ddbb5a99874add09f3f15 (diff)
Fix initialisation of ImageField super classes.
Fixes #16548, with thanks to pyriku. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/models/fields/files.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index 4ecb337b5a..d4b1743f97 100644
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -320,9 +320,10 @@ class ImageField(FileField):
descriptor_class = ImageFileDescriptor
description = _("File path")
- def __init__(self, verbose_name=None, name=None, width_field=None, height_field=None, **kwargs):
+ def __init__(self, verbose_name=None, name=None, width_field=None,
+ height_field=None, **kwargs):
self.width_field, self.height_field = width_field, height_field
- FileField.__init__(self, verbose_name, name, **kwargs)
+ super(ImageField, self).__init__(verbose_name, name, **kwargs)
def contribute_to_class(self, cls, name):
super(ImageField, self).contribute_to_class(cls, name)