Request.write with an empty str instance doesn't raise ValueError

[Jun Omae]

>>> from trac.test import EnvironmentStub, MockRequest
>>> env = EnvironmentStub()
>>> req = MockRequest(env)
>>> req.send(u'unicode contents')
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.send(u'')
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

Patch:

trac/web/api.py

@@ -982 +982 @@
         there are multiple calls to `write`, to the cumulative length
         of the *data* arguments.
         """
+        if isinstance(data, str):
+            raise ValueError("Can't send str content")
         if not self._write:
             self.end_headers()
         try:

trac/web/tests/api.py

@@ -440 +440 @@
         # anyway we're not supposed to send unicode, so we get a ValueError
         with self.assertRaises(ValueError):
             req.write('Föö')
+        with self.assertRaises(ValueError):
+            req.write('')
         with self.assertRaises(ValueError):
             req.write((b'F', 'öo'))
+        with self.assertRaises(ValueError):
+            req.write(('Föo'.encode('utf-8'), ''))
 
     def test_send_iterable(self):
         def iterable():

trac/web/tests/main.py

@@ -90 +90 @@
             def process_request(self, req):
                 self.calls += 1
                 req.authname
-                req.send('')
+                req.send(b'')
 
         cls.authenticators['success1'] = SuccessfulAuthenticator1
         cls.authenticators['success2'] = SuccessfulAuthenticator2

[Jun Omae]

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