Content-Length not sent from Request.send with a bytes instance

[Jun Omae]

When a bytes instance is passed to Request.send, Content-Length header is not sent. When a unicode instance is passed, the header wrongly is set (and the method fails with ValueError).

>>> from trac.test import EnvironmentStub, MockRequest
>>> env = EnvironmentStub()
>>> req = MockRequest(env)
>>> req.send(b'bytes data')
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/home/jun66j5/src/tracdev/git/trac/web/api.py", line 900, in send
    self._send(content, content_type, status)
  File "/home/jun66j5/src/tracdev/git/trac/web/api.py", line 1037, in _send
    raise RequestDone
trac.web.api.RequestDone
>>> req.response_sent.getvalue()
b'bytes data'
>>> req.headers_sent
{'Cache-Control': 'must-revalidate', 'Expires': 'Fri, 01 Jan 1999 00:00:00 GMT', 'Content-Type': 'text/html;charset=utf-8'}
>>>
>>> req = MockRequest(env)
>>> req.send(u'unicode data')
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/home/jun66j5/src/tracdev/git/trac/web/api.py", line 900, in send
    self._send(content, content_type, status)
  File "/home/jun66j5/src/tracdev/git/trac/web/api.py", line 1036, in _send
    self.write(content)
  File "/home/jun66j5/src/tracdev/git/trac/web/api.py", line 996, in write
    raise ValueError("Can't send str content")
ValueError: Can't send str content
>>> req.headers_sent
{'Cache-Control': 'must-revalidate', 'Expires': 'Fri, 01 Jan 1999 00:00:00 GMT', 'Content-Type': 'text/html;charset=utf-8', 'Content-Length': '12'}

trac/web/api.py

@@ -1028 +1028 @@
         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 +443 @@
         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,'

[Jun Omae]

Fixed in [17831] and merged in [17833].