Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #2045 - TypeError thrown if a form does not have the correct en…

…ctype for uploading

files.  It throws a ValidationError now, as it should.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3048 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit dbcd2fe985498889e1206f54c196f00879e79dae 1 parent fa97224
Luke Plant spookylukey authored
Showing with 16 additions and 4 deletions.
  1. +11 −3 django/core/validators.py
  2. +5 −1 django/forms/__init__.py
14 django/core/validators.py
View
@@ -146,7 +146,11 @@ def isValidImage(field_data, all_data):
from PIL import Image
from cStringIO import StringIO
try:
- Image.open(StringIO(field_data['content']))
+ content = field_data['content']
+ except TypeError:
+ raise ValidationError, gettext("No file was submitted. Check the encoding type on the form.")
+ try:
+ Image.open(StringIO(content))
except IOError: # Python Imaging Library doesn't recognize it as an image
raise ValidationError, gettext("Upload a valid image. The file you uploaded was either not an image or a corrupted image.")
@@ -366,9 +370,13 @@ def __init__(self, min_size=None, max_size=None, min_error_message=None, max_err
self.max_error_message = max_error_message or lazy_inter(gettext_lazy("Make sure your uploaded file is at most %s bytes big."), max_size)
def __call__(self, field_data, all_data):
- if self.min_size is not None and len(field_data['content']) < self.min_size:
+ try:
+ content = field_data['content']
+ except TypeError:
+ raise ValidationError, gettext_lazy("No file was submitted. Check the encoding type on the form.")
+ if self.min_size is not None and len(content) < self.min_size:
raise ValidationError, self.min_error_message
- if self.max_size is not None and len(field_data['content']) > self.max_size:
+ if self.max_size is not None and len(content) > self.max_size:
raise ValidationError, self.max_error_message
class MatchesRegularExpression:
6 django/forms/__init__.py
View
@@ -641,7 +641,11 @@ def __init__(self, field_name, is_required=False, validator_list=[]):
self.validator_list = [self.isNonEmptyFile] + validator_list
def isNonEmptyFile(self, field_data, all_data):
- if not field_data['content']:
+ try:
+ content = field_data['content']
+ except TypeError:
+ raise validators.CriticalValidationError, gettext("No file was submitted. Check the encoding type on the form.")
+ if not content:
raise validators.CriticalValidationError, gettext("The submitted file is empty.")
def render(self, data):
Please sign in to comment.
Something went wrong with that request. Please try again.