Revert "Always convert an uploaded file to a string, don't pass files…

… just because they're real files." This reverts commit 578f41a.
zopefoundation · Feb 2, 2017 · f6f605c · f6f605c
1 parent 29d15e4
commit f6f605c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,8 +8,6 @@ CHANGES
 - Fixed browser to only follow redirects for HTTP statuses
   301, 302, 303, and 307; not other 30x statuses such as 304.
 
-- Fix passing a real file to ``add_file``.
-
 
 5.1 (2017-01-31)
 ----------------

diff --git a/src/zope/testbrowser/browser.py b/src/zope/testbrowser/browser.py
@@ -698,7 +698,11 @@ def add_file(self, file, content_type, filename):
             raise TypeError("Can't call add_file on %s controls"
                             % self.mech_control.type)
 
-        contents = file.read()
+        if isinstance(file, io.IOBase):
+            contents = file.read()
+        else:
+            contents = file
+
         self._form[self.name] = webtest.forms.Upload(filename or '', contents,
                                                      content_type)