Merge remote-tracking branch 'origin/master' into to-str-with-list

zopefoundation · Feb 2, 2017 · 770adf2 · 770adf2
2 parents 1d718d7 + 29d15e4
commit 770adf2
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/zope/testbrowser/browser.py b/src/zope/testbrowser/browser.py
@@ -704,11 +704,7 @@ def add_file(self, file, content_type, filename):
             raise TypeError("Can't call add_file on %s controls"
                             % self.mech_control.type)
 
-        if isinstance(file, io.IOBase):
-            contents = file.read()
-        else:
-            contents = file
-
+        contents = file.read()
         self._form[self.name] = webtest.forms.Upload(filename or '', contents,
                                                      content_type)