Ticket #6009: patch-6009-1.diff

tests/regressiontests/forms/models.py

@@ +1 @@
+# -*- coding: utf-8 -*-
 import datetime
 
 from django.db import models
+from django import newforms as django_forms
 
 class BoundaryModel(models.Model):
     positive_integer = models.PositiveIntegerField(null=True, blank=True)
@@ -14 +16 @@
     """For ModelChoiceField and ModelMultipleChoiceField tests."""
     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.core.files.uploadedfile import SimpleUploadedFile
 >>> from django.newforms import form_for_model, form_for_instance
 
+# 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 #########################
 >>> BoundaryForm = form_for_model(BoundaryModel)
 >>> f = BoundaryForm({'positive_integer':100})

tests/regressiontests/forms/fields.py

@@ -802 +802 @@
 >>> type(f.clean(SimpleUploadedFile('name', 'Some File Content')))
 <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'>
 

tests/regressiontests/forms/forms.py

@@ -1480 +1480 @@
 >>> f.is_valid()
 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 #############################################
 
 >>> from django.template import Template, Context