summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorManatsawin Hanmongkolchai <manatsawin+git@gmail.com>2017-05-28 14:05:21 +0700
committerTim Graham <timograham@gmail.com>2017-06-01 10:44:47 -0400
commit110bd820380e06fc8572f94b36bba6fc9d057a6b (patch)
treef76f09265ce2a5883826ad7e4c1719849c74451c /django
parentaf9a81aa7f14ae1a9fd1f25676f526a43f0c65f3 (diff)
[1.11.x] Fixed #28242 -- Moved ImageField file extension validation to the form field.
Backport of a0c07d77fc313388c72a17cd59411265069f037f from master
Diffstat (limited to 'django')
-rw-r--r--django/db/models/fields/files.py2
-rw-r--r--django/forms/fields.py1
2 files changed, 1 insertions, 2 deletions
diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index e877fc7ef4..6906b8f485 100644
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -8,7 +8,6 @@ from django.core import checks
from django.core.files.base import File
from django.core.files.images import ImageFile
from django.core.files.storage import default_storage
-from django.core.validators import validate_image_file_extension
from django.db.models import signals
from django.db.models.fields import Field
from django.utils import six
@@ -387,7 +386,6 @@ class ImageFieldFile(ImageFile, FieldFile):
class ImageField(FileField):
- default_validators = [validate_image_file_extension]
attr_class = ImageFieldFile
descriptor_class = ImageFileDescriptor
description = _("Image")
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 168ea9673c..33ed2882a3 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -610,6 +610,7 @@ class FileField(Field):
class ImageField(FileField):
+ default_validators = [validators.validate_image_file_extension]
default_error_messages = {
'invalid_image': _(
"Upload a valid image. The file you uploaded was either not an "