Deal with UTF-8 filenames until https://bugs.launchpad.net/zope2/+bug…

…/499696 is fixed.

Fixes http://code.google.com/p/dexterity/issues/detail?id=148

svn path=/plone.formwidget.namedfile/trunk/; revision=46983

docs/HISTORY.txt

@@ -4,8 +4,9 @@ Changelog
 1.0b9 (unreleased)
 ------------------
 
-* Fix handling of unicode filenames when quoting the URL.
-  [rossp]
+* Fix handling of unicode filenames when converting or quoting the URL.
+  Fixes http://code.google.com/p/dexterity/issues/detail?id=148
+  [rossp, mj]
 
 * Added Spanish translations.
   [dukebody]

plone/formwidget/namedfile/converter.py

@@ -29,8 +29,10 @@ def toFieldValue(self, value):
             headers = value.headers
             filename = safe_basename(value.filename)
 
-            if filename is not None:
-                filename = unicode(filename)
+            if filename is not None and not isinstance(filename, unicode):
+                # Work-around for
+                # https://bugs.launchpad.net/zope2/+bug/499696
+                filename = filename.decode('utf-8')
 
             contentType = 'application/octet-stream'
             if headers:

plone/formwidget/namedfile/widget.txt

@@ -470,15 +470,17 @@ A data string is converted to the appropriate type:
   <plone.namedfile.file.NamedImage object at ...>
 
 A FileUpload object is converted to the appropriate type, preserving filename
-and content type.
+and content type, and possibly handling international characters in filenames.
 
   >>> myfile = cStringIO.StringIO('File upload contents.')
-  >>> aFieldStorage = FieldStorageStub(myfile, filename='random.txt', headers={'Content-Type': 'text/x-dummy'})
+  >>> # \xc3\xb8 is UTF-8 for a small letter o with slash
+  >>> aFieldStorage = FieldStorageStub(myfile, filename='rand\xc3\xb8m.txt',
+  ...     headers={'Content-Type': 'text/x-dummy'})
   >>> file_obj = file_converter.toFieldValue(FileUpload(aFieldStorage))
   >>> file_obj.data
   'File upload contents.'
   >>> file_obj.filename
-  u'random.txt'
+  u'rand\xf8m.txt'
   >>> file_obj.contentType
   'text/x-dummy'