1.6.1dev: fix Request.send not set Content-Length header for a `b…

…ytes` instance (closes #13761)

git-svn-id: http://trac.edgewall.org/intertrac/log:/branches/1.6-stable@17831 af82e41b-90c4-0310-8c96-b1721e28e2e2

trac/web/api.py

@@ -1028,7 +1028,7 @@ def _send(self, content, content_type='text/html', status=200,
         self.send_header('Cache-Control', 'must-revalidate')
         self.send_header('Expires', 'Fri, 01 Jan 1999 00:00:00 GMT')
         self.send_header('Content-Type', content_type + ';charset=utf-8')
-        if isinstance(content, str):
+        if isinstance(content, bytes):
             self.send_header('Content-Length', len(content))
         self.end_headers(exc_info)
 

trac/web/tests/api.py

@@ -443,6 +443,17 @@ def test_write_unicode(self):
         with self.assertRaises(ValueError):
             req.write((b'F', 'öo'))
 
+    def test_send_bytes(self):
+        req = _make_req(_make_environ(method='GET'))
+        with self.assertRaises(RequestDone):
+            req.send(b'\xef\xbb\xbf')
+        self.assertEqual('3', req.headers_sent.get('Content-Length'))
+
+    def test_send_unicode(self):
+        req = _make_req(_make_environ(method='GET'))
+        with self.assertRaises(ValueError):
+            req.send(u'\ufeff')
+
     def test_send_iterable(self):
         def iterable():
             yield b'line1,'