Fix HTTPResponse.setBody when the publisher returns a tuple

CHANGES.rst

@@ -47,6 +47,8 @@ Bugfixes
   when reading request bodies not encoded as application/x-www-form-urlencoded
   or multipart/form-data.
 
+- Fix `HTTPResponse.setBody` when the published object returns a tuple.
+
 
 4.0b5 (2018-05-18)
 ------------------

src/ZPublisher/HTTPResponse.py

@@ -511,7 +511,7 @@ def setBody(self, body, title='', is_error=False, lock=None):
         else:
             try:
                 body = bytes(body)
-            except UnicodeError:
+            except (TypeError, UnicodeError):
                 body = self._encode_unicode(text_type(body))
 
         # At this point body is always binary

src/ZPublisher/tests/testHTTPResponse.py

@@ -654,6 +654,10 @@ def test_setBody_w_bogus_pseudo_HTML(self):
         response = self._makeOne()
         self.assertRaises(NotFound, response.setBody, BOGUS)
 
+    def test_setBody_tuple(self):
+        response = self._makeOne()
+        self.assertEqual(b"('a',)", response.setBody(('a',)))
+
     def test_setBody_calls_insertBase(self):
         response = self._makeOne()
         lamb = {}