Changeset 7987

Timestamp:

07/19/08 13:47:59 (4 months ago)

Author:

mtredinnick

Message:

Fixed #6009 -- Added regression tests to show that uploading non-ASCII
filenames now works properly. Patch from Leah Culver.

Files:

• django/trunk/tests/regressiontests/forms/fields.py (modified) (1 diff)
• django/trunk/tests/regressiontests/forms/forms.py (modified) (1 diff)
• django/trunk/tests/regressiontests/forms/models.py (modified) (2 diffs)

django/trunk/tests/regressiontests/forms/fields.py

@@ -803 +803 @@
-<class 'django.core.files.uploadedfile.SimpleUploadedFile'>
-
+>>> type(f.clean(SimpleUploadedFile('我隻氣墊船裝滿晒鱔.txt', 'मेरी मँडराने वाली नाव सर्पमीनों से भरी ह')))
+<class 'django.core.files.uploadedfile.SimpleUploadedFile'>
+
->>> type(f.clean(SimpleUploadedFile('name', 'Some File Content'), 'files/test4.pdf'))
-<class 'django.core.files.uploadedfile.SimpleUploadedFile'>

django/trunk/tests/regressiontests/forms/forms.py

@@ -1481 +1481 @@
-True
-
+>>> f = FileForm(data={}, files={'file1': SimpleUploadedFile('我隻氣墊船裝滿晒鱔.txt', 'मेरी मँडराने वाली नाव सर्पमीनों से भरी ह')}, auto_id=False)
+>>> print f
+<tr><th>File1:</th><td><input type="file" name="file1" /></td></tr>
+
-# Basic form processing in a view #############################################
-

django/trunk/tests/regressiontests/forms/models.py

@@ +1 @@
+# -*- coding: utf-8 -*-
-import datetime
-
-from django.db import models
+# Can't import as "forms" due to implementation details in the test suite (the
+# current file is called "forms" an is already imported).
+from django import forms as django_forms
-
-class BoundaryModel(models.Model):
@@ -15 +19 @@
-    name = models.CharField(max_length=10)
-
+class FileModel(models.Model):
+    file = models.FileField(upload_to='/')
+
+class FileForm(django_forms.Form):
+    file1 = django_forms.FileField()
+
-__test__ = {'API_TESTS': """
->>> from django.forms import form_for_model, form_for_instance
+>>> from django.core.files.uploadedfile import SimpleUploadedFile
+
+# FileModel with unicode filename and data #########################
+>>> f = FileForm(data={}, files={'file1': SimpleUploadedFile('我隻氣墊船裝滿晒鱔.txt', 'मेरी मँडराने वाली नाव सर्पमीनों से भरी ह')}, auto_id=False)
+>>> f.is_valid()
+True
+>>> f.cleaned_data
+{'file1': <SimpleUploadedFile: 我隻氣墊船裝滿晒鱔.txt (text/plain)>}
+>>> m = FileModel.objects.create(file=f.cleaned_data['file1'])
-
-# Boundary conditions on a PostitiveIntegerField #########################