Ticket #6302: pass_initial_through_with_tests_3.diff

a/django/db/models/fields/__init__.py

@@ -797 +797 @@
-        return os.path.normpath(f)
-
-    def save_form_data(self, instance, data):
-
+
+
-            getattr(instance, "save_%s_file" % self.name)(data.filename, data.content, save=False)
-
-    def formfield(self, **kwargs):
-        defaults = {'form_class': forms.FileField}
-        # If a file has been provided previously, then the form doesn't require
-        # that a new file is provided this time.
-        if 'initial' in kwargs:
-            defaults['required'] = False
-        defaults.update(kwargs)
-        return super(FileField, self).formfield(**defaults)
-

a/django/newforms/fields.py

@@ -437 +437 @@
-    def __init__(self, *args, **kwargs):
-        super(FileField, self).__init__(*args, **kwargs)
-
-
-
+, initial=None
+initial or 
-        if not self.required and data in EMPTY_VALUES:
-            return None
+        elif not data and initial:
+            return initial
-        try:
-            f = UploadedFile(data['filename'], data['content'])
-        except TypeError:
@@ -456 +458 @@
-        'invalid_image': _(u"Upload a valid image. The file you uploaded was either not an image or a corrupted image."),
-    }
-
-
+, initial=None
-        """
-        Checks that the file-upload field data contains a valid image (GIF, JPG,
-        PNG, possibly others -- whatever the Python Imaging Library supports).
-        """
-
+, initial
-        if f is None:
-            return None
-        from PIL import Image

a/django/newforms/forms.py

@@ -9 +9 @@
-from django.utils.encoding import StrAndUnicode, smart_unicode, force_unicode
-from django.utils.safestring import mark_safe
-
-
+, FileField
-from widgets import TextInput, Textarea
-from util import flatatt, ErrorDict, ErrorList, ValidationError
-
@@ -182 +182 @@
-            # widgets split data over several HTML fields.
-            value = field.widget.value_from_datadict(self.data, self.files, self.add_prefix(name))
-            try:
-
+
+
+
+
+
-                self.cleaned_data[name] = value
-                if hasattr(self, 'clean_%s' % name):
-                    value = getattr(self, 'clean_%s' % name)()

a/tests/modeltests/model_forms/models.py

@@ -7 +7 @@
-most of these tests should be rewritten.
-"""
-
+import os
+import tempfile
+
-from django.db import models
-
-ARTICLE_STATUS = (
@@ -55 +58 @@
-    def __unicode__(self):
-        return self.phone
-
+class TextFile(models.Model):
+    description = models.CharField(max_length=20)
+    file = models.FileField(upload_to=tempfile.gettempdir())
+
+    def __unicode__(self):
+        return self.description
+
-__test__ = {'API_TESTS': """
->>> from django import newforms as forms
->>> from django.newforms.models import ModelForm
@@ -701 +711 @@
-True
->>> f.cleaned_data
-{'phone': u'312-555-1212', 'description': u'Assistance'}
+
+# FileField ###################################################################
+
+>>> class TextFileForm(ModelForm):
+...     class Meta:
+...         model = TextFile
+
+Test conditions when files is either not given or empty.
+
+>>> f = TextFileForm(data={'description': u'Assistance'})
+>>> f.is_valid()
+False
+>>> f = TextFileForm(data={'description': u'Assistance'}, files={})
+>>> f.is_valid()
+False
+
+Upload a file and ensure it all works as expected.
+
+>>> f = TextFileForm(data={'description': u'Assistance'}, files={'file': {'filename': 'test1.txt', 'content': 'hello world'}})
+>>> f.is_valid()
+True
+>>> type(f.cleaned_data['file'])
+<class 'django.newforms.fields.UploadedFile'>
+>>> instance = f.save()
+>>> instance.file
+u'.../test1.txt'
+
+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.
+
+>>> f = TextFileForm(data={'description': u'Assistance'}, instance=instance)
+>>> f.is_valid()
+True
+>>> f.cleaned_data['file']
+u'.../test1.txt'
+>>> instance = f.save()
+>>> instance.file
+u'.../test1.txt'
+
+Delete the current file since this is not done by Django.
+
+>>> os.unlink(instance.get_file_filename())
+
+Override the file by uploading a new one.
+
+>>> f = TextFileForm(data={'description': u'Assistance'}, files={'file': {'filename': 'test2.txt', 'content': 'hello world'}}, instance=instance)
+>>> f.is_valid()
+True
+>>> instance = f.save()
+>>> instance.file
+u'.../test2.txt'
+
+>>> instance.delete()
+
+Test the non-required FileField
+
+>>> f = TextFileForm(data={'description': u'Assistance'})
+>>> f.fields['file'].required = False
+>>> f.is_valid()
+True
+>>> instance = f.save()
+>>> instance.file
+''
+
+>>> f = TextFileForm(data={'description': u'Assistance'}, files={'file': {'filename': 'test3.txt', 'content': 'hello world'}}, instance=instance)
+>>> f.is_valid()
+True
+>>> instance = f.save()
+>>> instance.file
+u'.../test3.txt'
+>>> instance.delete()
-"""}

a/tests/regressiontests/forms/fields.py

@@ -749 +749 @@
-...
-ValidationError: [u'This field is required.']
-
+>>> f.clean('', '')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+>>> f.clean('', 'files/test1.pdf')
+'files/test1.pdf'
+
->>> f.clean(None)
-Traceback (most recent call last):
-...
-ValidationError: [u'This field is required.']
-
+>>> f.clean(None, '')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+>>> f.clean(None, 'files/test2.pdf')
+'files/test2.pdf'
+
->>> f.clean({})
-Traceback (most recent call last):
-...
-ValidationError: [u'No file was submitted.']
-
+>>> f.clean({}, '')
+Traceback (most recent call last):
+...
+ValidationError: [u'No file was submitted.']
+
+>>> f.clean({}, 'files/test3.pdf')
+'files/test3.pdf'
+
->>> f.clean('some content that is not a file')
-Traceback (most recent call last):
-...
-ValidationError: [u'No file was submitted. Check the encoding type on the form.']
-
-
+ 
-Traceback (most recent call last):
-...
-ValidationError: [u'The submitted file is empty.']
-
-
+ 
-Traceback (most recent call last):
-...
-ValidationError: [u'The submitted file is empty.']
-
-
+
+
+
+
-<class 'django.newforms.fields.UploadedFile'>
-
-# URLField ##################################################################