Merge pull request #78 from collective/unicode_filename_save

Fix saver action with non ASCII filename uploads #77

CHANGES.rst

@@ -17,6 +17,8 @@ Bug fixes:
 - In the schema editor for fields, Fix the URL to ACE library according to the modeleditor in plone.app.dexterity.
   [thet]
 
+- Fix saver action with non ASCII filename uploads #77
+  [tomgross]
 
 2.0.0b1 (2017-06-14)
 --------------------

src/collective/easyform/actions.py

@@ -622,7 +622,7 @@ def getSavedFormInputForEdit(self, header=False, delimiter=','):
             def get_data(row, i):
                 data = row.get(i, '')
                 if self._is_file_data(data):
-                    return data.filename
+                    data = data.filename
                 if isinstance(data, unicode):
                     return data.encode('utf-8')
                 return data

src/collective/easyform/tests/attachment.rst

@@ -209,3 +209,21 @@ Check saved data::
     >>> browser.getControl("Download").click()
 
 
+Test file uploads with non ASCII characters in the title
+
+    >>> browser.open(portal_url + '/attachmentform')
+    >>> browser.getControl('Your E-Mail Address').value = 'test@example.com'
+    >>> browser.getControl('Subject').value = u'München'.encode('latin-1')
+    >>> browser.getControl('Comments').value = 'PFG rocks!'
+    >>> browser.getControl(name='form.widgets.attachment').add_file(cStringIO.StringIO('file contents'), 'text/plain', u'Zürich.txt'.encode('latin-1'))
+    >>> browser.getControl('Submit').click()
+    <sent mail from ...to ['mdummy@address.com']>
+    >>> 'Thanks for your input.' in browser.contents
+    True
+    >>> from collective.easyform.api import get_actions
+    >>> saver = get_actions(layer['portal']['attachmentform'])['saver']
+    >>> print(saver.getSavedFormInputForEdit())
+    test@example.com,München,PFG rocks!,Zürich.txt
+    <BLANKLINE>
+
+