Merge branch 'master' into dictmulti3.0

Conflicts:
	CHANGES.txt

CHANGES.txt

@@ -2,11 +2,17 @@
 CHANGES
 =======
 
-3.0.0a3 (unreleased)
+3.0.0a4 (unreleased)
 --------------------
 
 - Added support for IDict Widget in MultiWidget.
-- Updated pt_BR translation
+
+
+3.0.0a3 (2013-04-08)
+--------------------
+
+- Updated pt_BR translation.
+- Fixed a bug where file input value was interpeted as UTF-8.
 
 
 3.0.0a2 (2013-02-26)

setup.py

@@ -61,7 +61,7 @@ def alltests():
 
 setup(
     name='z3c.form',
-    version='3.0.0a3.dev0',
+    version='3.0.0a4.dev0',
     author="Stephan Richter, Roger Ineichen and the Zope Community",
     author_email="zope-dev@zope.org",
     description="An advanced form and widget framework for Zope 3",

src/z3c/form/browser/README.txt

@@ -342,7 +342,7 @@ Bytes
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> widget.render().strip('\r\n')
-  u'<span id="foo" class="file-widget required bytes-field">Default bytes</span>'
+  u'<span id="foo" class="file-widget required bytes-field"></span>'
 
 Calling the widget will return the widget including the layout
 
@@ -355,7 +355,7 @@ Calling the widget will return the widget including the layout
       </label>
     </div>
     <div class="widget">
-  <span id="foo" class="file-widget required bytes-field">Default bytes</span>
+  <span id="foo" class="file-widget required bytes-field"></span>
   </div>
   </div>
 

src/z3c/form/converter.py

@@ -221,7 +221,7 @@ class FileUploadDataConverter(BaseDataConverter):
 
     def toWidgetValue(self, value):
         """See interfaces.IDataConverter"""
-        return value.decode()
+        return None
 
     def toFieldValue(self, value):
         """See interfaces.IDataConverter"""

src/z3c/form/converter.txt

@@ -427,11 +427,11 @@ fields storage stub ...
 and a ``FileUpload`` component:
 
   >>> try:
-  ...     from cStringIO import StringIO
+  ...     from cStringIO import StringIO as BytesIO
   ... except ImportError:
-  ...     from io import StringIO
+  ...     from io import BytesIO
   >>> from zope.publisher.browser import FileUpload
-  >>> myfile = StringIO('File upload contents.')
+  >>> myfile = BytesIO(b'File upload contents.')
   >>> aFieldStorage = FieldStorageStub(myfile)
   >>> myUpload = FileUpload(aFieldStorage)
 
@@ -457,7 +457,7 @@ the upload, since you are normaly not able to upload a file without a filename:
   ...         self.file = file
   ...         self.headers = {}
   ...         self.filename = ''
-  >>> myfile = StringIO('')
+  >>> myfile = BytesIO(b'')
   >>> aFieldStorage = EmptyFilenameFieldStorageStub(myfile)
   >>> myUpload = FileUpload(aFieldStorage)
   >>> bytes = zope.schema.Bytes()
@@ -481,8 +481,7 @@ There is also a ``ValueError`` if we don't get a seekable file from the
 When converting to the widget value, not conversion should be done, since
 bytes are not convertable in that sense.
 
-  >>> fudc.toWidgetValue(b'bytes')
-  'bytes'
+  >>> fudc.toWidgetValue(b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x04')
 
 When the file upload widget is not used and a text-based widget is desired,
 then the regular field data converter will be chosen. Using a text widget,