diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2007-09-15 21:21:37 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2007-09-15 21:21:37 +0000 |
| commit | fb6a0c8ffa1cd74c63aaf4b011665e5952d449e7 (patch) | |
| tree | 4af2f7d6a2d1d91adf80243c67176effecf0c8b8 /django/db | |
| parent | c8f6e485b8b7329418ca030421b9bde4ec164854 (diff) | |
queryset-refactor: Merged to [6155]
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6332 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db')
| -rw-r--r-- | django/db/models/fields/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index 7c458cb001..af28e5f441 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -855,6 +855,7 @@ class ImageField(FileField): def formfield(self, **kwargs): defaults = {'form_class': forms.ImageField} + defaults.update(kwargs) return super(ImageField, self).formfield(**defaults) class IntegerField(Field): |