Ticket #14787: 14787.diff

django/forms/fields.py

@@ -571 +571 @@
             'Ensure this filename has at most %(max)d character (it has %(length)d).',
             'Ensure this filename has at most %(max)d characters (it has %(length)d).',
             'max'),
+        'max_size': _("The submitted file exceeds the maximum size specified."),
         'contradiction': _('Please either submit a file or check the clear checkbox, not both.')
     }
 
     def __init__(self, *args, **kwargs):
         self.max_length = kwargs.pop('max_length', None)
         self.allow_empty_file = kwargs.pop('allow_empty_file', False)
+        self.max_size = kwargs.pop('max_size', None)  # size in mb
         super(FileField, self).__init__(*args, **kwargs)
 
     def to_python(self, data):
@@ -597 +599 @@
             raise ValidationError(self.error_messages['invalid'], code='invalid')
         if not self.allow_empty_file and not file_size:
             raise ValidationError(self.error_messages['empty'], code='empty')
+        if self.max_size is not None and file_size > (self.max_size * 2 ** 20):
+            raise ValidationError(self.error_messages['max_size'], code='max_size')
 
         return data
 

tests/forms_tests/tests/test_error_messages.py

@@ -143 +143 @@
             'invalid': 'INVALID',
             'missing': 'MISSING',
             'empty': 'EMPTY FILE',
+            'max_size': 'EXCEEDS SIZE'
         }
-        f = FileField(error_messages=e)
+        f = FileField(error_messages=e, max_size=2 ** (-20))
         self.assertFormErrors(['REQUIRED'], f.clean, '')
         self.assertFormErrors(['INVALID'], f.clean, 'abc')
         self.assertFormErrors(['EMPTY FILE'], f.clean, SimpleUploadedFile('name', None))
         self.assertFormErrors(['EMPTY FILE'], f.clean, SimpleUploadedFile('name', ''))
+        self.assertFormErrors(['EXCEEDS SIZE'], f.clean, SimpleUploadedFile('name', b'test file'))
 
     def test_urlfield(self):
         e = {