Ticket #6009: patch.diff

django/newforms/fields.py

@@ -444 +444 @@
         elif not data and initial:
             return initial
         try:
-            f = UploadedFile(data['filename'], data['content'])
+            f = UploadedFile(data['filename'].decode('utf8'), data['content'])
         except TypeError:
             raise ValidationError(self.error_messages['invalid'])
         except KeyError:

tests/regressiontests/model_fields/tests.py

@@ -1 @@
-"""
+#encoding=utf8
+__test__ = {'API_TESTS': """
 >>> from django.db.models.fields import *
 
 # DecimalField
@@ -15 +16 @@
 Traceback (most recent call last):
 ...
 ValidationError: [u'This value must be a decimal number.']
-"""
+
+"""}
+
+from django.db.models import Model
+from django.db.models.fields import FileField
+from django.newforms import Form
+from django.newforms.fields import FileField as FormFileField
+
+class FileForm(Form):
+    file = FormFileField()
+
+class FileModel(Model):
+    file = FileField(upload_to='/')
+
+__test__['API_TESTS'] += """
+>>> f = FileForm({}, {'file' : {'filename' : 'kø.jpg', 'content' : 'data'}})
+>>> f.is_valid()
+True
+>>> m = FileModel.objects.create(file=f.cleaned_data['file'])
+
+"""
+ No newline at end of file