Ticket #10149: filefield_patch_and_tests-r9962.diff

django/db/models/fields/files.py

@@ -218 +218 @@
             setattr(instance, self.name, data)
 
     def formfield(self, **kwargs):
-        defaults = {'form_class': forms.FileField}
+        defaults = { 'form_class': forms.FileField, 'max_length' : self.max_length }
         # If a file has been provided previously, then the form doesn't require
         # that a new file is provided this time.
         # The code to mark the form field as not required is used by

django/forms/fields.py

@@ -446 +446 @@
         'invalid': _(u"No file was submitted. Check the encoding type on the form."),
         'missing': _(u"No file was submitted."),
         'empty': _(u"The submitted file is empty."),
+        'max_length': _(u"Filename too long. Max: %(max)d characters."),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length = None, *args, **kwargs):
+        self.max_length = max_length
         super(FileField, self).__init__(*args, **kwargs)
 
     def clean(self, data, initial=None):
@@ -465 +467 @@
         except AttributeError:
             raise ValidationError(self.error_messages['invalid'])
 
+        if self.max_length is not None and len(file_name) > self.max_length:
+            raise ValidationError(self.error_messages['max_length'] % {'max': self.max_length, })
         if not file_name:
             raise ValidationError(self.error_messages['invalid'])
         if not file_size:

tests/modeltests/model_forms/models.py

@@ -93 +93 @@
 
 class TextFile(models.Model):
     description = models.CharField(max_length=20)
-    file = models.FileField(storage=temp_storage, upload_to='tests')
+    file = models.FileField(storage=temp_storage, upload_to='tests', max_length=15)
 
     def __unicode__(self):
         return self.description
@@ -995 +995 @@
 >>> instance.file
 <FieldFile: tests/test1.txt>
 
+# Checking if max_length attr has been inherited from model to form by ModelForm.
+>>> f = TextFileForm(data={'description': u'Assistance'}, files={'file': SimpleUploadedFile('test-maxlength.txt', 'hello world')})
+>>> f.is_valid()
+False
+
 # Edit an instance that already has the file defined in the model. This will not
 # save the file again, but leave it exactly as it is.
 

tests/regressiontests/forms/fields.py

@@ -845 +845 @@
 >>> type(f.clean(SimpleUploadedFile('name', 'Some File Content'), 'files/test4.pdf'))
 <class 'django.core.files.uploadedfile.SimpleUploadedFile'>
 
+>>> f = FileField(max_length = 5)
+>>> f.clean(SimpleUploadedFile('test_maxlength.txt', 'hello world'))
+Traceback (most recent call last):
+...
+ValidationError: [u'Filename too long. Max: 5 characters.']
+
+>>> f.clean('', 'files/test1.pdf')
+'files/test1.pdf'
+
+>>> f.clean(None, 'files/test2.pdf')
+'files/test2.pdf'
+
+>>> type(f.clean(SimpleUploadedFile('name', 'Some File Content')))
+<class 'django.core.files.uploadedfile.SimpleUploadedFile'>
+
 # URLField ##################################################################
 
 >>> f = URLField()