Changeset 7814 for django/trunk/tests/modeltests/model_forms

Timestamp:

07/01/08 10:10:51 (2 months ago)

Author:

jacob

Message:

Fixed #2070: refactored Django's file upload capabilities.

A description of the new features can be found in the new upload handling documentation; the executive summary is that Django will now happily handle uploads of large files without issues.

This changes the representation of uploaded files from dictionaries to bona fide objects; see BackwardsIncompatibleChanges for details.

Files:

• django/trunk/tests/modeltests/model_forms/models.py (modified) (13 diffs)

django/trunk/tests/modeltests/model_forms/models.py

@@ -68 +68 @@
-class ImageFile(models.Model):
-    description = models.CharField(max_length=20)
-
+
+
+
+
+
+
+
-
-    def __unicode__(self):
@@ -76 +82 @@
->>> from django import newforms as forms
->>> from django.newforms.models import ModelForm
+>>> from django.core.files.uploadedfile import SimpleUploadedFile
-
-The bare bones, absolutely nothing custom, basic case.
@@ -793 +800 @@
-# Upload a file and ensure it all works as expected.
-
-{'filename': 'test1.txt', 'content': 'hello world'}
+SimpleUploadedFile('test1.txt', 'hello world')
->>> f.is_valid()
-True
@@ -802 +809 @@
-u'...test1.txt'
-
+>>> os.unlink(instance.get_file_filename())
+
+>>> f = TextFileForm(data={'description': u'Assistance'}, files={'file': SimpleUploadedFile('test1.txt', '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.
@@ -815 +833 @@
-
-# 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.
-
-{'filename': 'test2.txt', 'content': 'hello world'}
+SimpleUploadedFile('test2.txt', 'hello world')
->>> f.is_valid()
-True
@@ -827 +844 @@
-u'...test2.txt'
-
+# Delete the current file since this is not done by Django.
+>>> os.unlink(instance.get_file_filename())
+
+>>> f = TextFileForm(data={'description': u'Assistance'}, files={'file': SimpleUploadedFile('test2.txt', 'hello world')})
+>>> f.is_valid()
+True
+>>> instance = f.save()
+>>> instance.file
+u'...test2.txt'
+
+# Delete the current file since this is not done by Django.
+>>> os.unlink(instance.get_file_filename())
+
->>> instance.delete()
-
@@ -839 +869 @@
-''
-
-{'filename': 'test3.txt', 'content': 'hello world'}
+SimpleUploadedFile('test3.txt', 'hello world')
->>> f.is_valid()
-True
@@ -845 +875 @@
->>> instance.file
-u'...test3.txt'
+
+# Delete the current file since this is not done by Django.
+>>> os.unlink(instance.get_file_filename())
+>>> instance.delete()
+
+>>> f = TextFileForm(data={'description': u'Assistance'}, files={'file': SimpleUploadedFile('test3.txt', 'hello world')})
+>>> f.is_valid()
+True
+>>> instance = f.save()
+>>> instance.file
+u'...test3.txt'
+
+# Delete the current file since this is not done by Django.
+>>> os.unlink(instance.get_file_filename())
->>> instance.delete()
-
@@ -859 +903 @@
->>> image_data = open(os.path.join(os.path.dirname(__file__), "test.png")).read()
-
-{'filename': 'test.png', 'content': image_data}
+SimpleUploadedFile('test.png', image_data)
->>> f.is_valid()
-True
@@ -868 +912 @@
-u'...test.png'
-
+# Delete the current file since this is not done by Django.
+>>> os.unlink(instance.get_image_filename())
+
+>>> f = ImageFileForm(data={'description': u'An image'}, files={'image': SimpleUploadedFile('test.png', image_data)})
+>>> f.is_valid()
+True
+>>> type(f.cleaned_data['image'])
+<class 'django.newforms.fields.UploadedFile'>
+>>> instance = f.save()
+>>> instance.image
+u'...test.png'
+
-# Edit an instance that already has the image defined in the model. This will not
-# save the image again, but leave it exactly as it is.
@@ -886 +942 @@
-# Override the file by uploading a new one.
-
-{'filename': 'test2.png', 'content': image_data}
+SimpleUploadedFile('test2.png', image_data)
->>> f.is_valid()
-True
@@ -893 +949 @@
-u'...test2.png'
-
+# Delete the current file since this is not done by Django.
+>>> os.unlink(instance.get_image_filename())
+>>> instance.delete()
+
+>>> f = ImageFileForm(data={'description': u'Changed it'}, files={'image': SimpleUploadedFile('test2.png', image_data)})
+>>> f.is_valid()
+True
+>>> instance = f.save()
+>>> instance.image
+u'...test2.png'
+
+# Delete the current file since this is not done by Django.
+>>> os.unlink(instance.get_image_filename())
->>> instance.delete()
-
@@ -905 +974 @@
-''
-
-
+
+
+
+
+
+
+
+
+
+
+
+
->>> f.is_valid()
-True