diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py index fec66f39ac..b639f6eec8 100644 --- a/tornado/test/web_test.py +++ b/tornado/test/web_test.py @@ -1687,6 +1687,18 @@ def test_204_headers(self): self.assertNotIn("Transfer-Encoding", response.headers) +class Header204viaHTTPErrorTest(SimpleHandlerTestCase): + class Handler(RequestHandler): + def get(self): + raise HTTPError(204) + + def test_204_headers_via_httperror(self): + response = self.fetch("/") + self.assertEqual(response.code, 204) + self.assertNotIn("Content-Length", response.headers) + self.assertNotIn("Transfer-Encoding", response.headers) + + class Header304Test(SimpleHandlerTestCase): class Handler(RequestHandler): def get(self): diff --git a/tornado/web.py b/tornado/web.py index 039396470f..2a8ec00244 100644 --- a/tornado/web.py +++ b/tornado/web.py @@ -466,7 +466,8 @@ def get_arguments(self, name: str, strip: bool = True) -> List[str]: # Make sure `get_arguments` isn't accidentally being called with a # positional argument that's assumed to be a default (like in # `get_argument`.) - assert isinstance(strip, bool) + if not isinstance(strip, bool): + raise ValueError("`strip` must be boolean") return self._get_arguments(name, self.request.arguments, strip) @@ -1186,6 +1187,10 @@ def flush(self, include_footers: bool = False) -> "Future[None]": future.set_result(None) return future + def _should_not_send_content(self, status_code: int) -> bool: + """Check if we should not send body content for given `status_code`""" + return status_code in (204, 304) or (100 <= status_code < 200) + def finish(self, chunk: Optional[Union[str, bytes, dict]] = None) -> "Future[None]": """Finishes this response, ending the HTTP request. @@ -1219,10 +1224,9 @@ def finish(self, chunk: Optional[Union[str, bytes, dict]] = None) -> "Future[Non if self.check_etag_header(): self._write_buffer = [] self.set_status(304) - if self._status_code in (204, 304) or (100 <= self._status_code < 200): - assert not self._write_buffer, ( - "Cannot send body with %s" % self._status_code - ) + if self._should_not_send_content(self._status_code): + if self._write_buffer: + raise RuntimeError(f"Cannot send body with status code HTTP{self._status_code}") self._clear_representation_headers() elif "Content-Length" not in self._headers: content_length = sum(len(part) for part in self._write_buffer) @@ -1319,6 +1323,8 @@ def write_error(self, status_code: int, **kwargs: Any) -> None: for line in traceback.format_exception(*kwargs["exc_info"]): self.write(line) self.finish() + elif self._should_not_send_content(status_code): + self.finish() else: self.finish( "%(code)d: %(message)s"