TonBERRY/microdot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept responses with just a status code (Fixes #263)

Browse Source
This commit is contained in:
Miguel Grinberg
2024-11-10 00:34:21 +00:00
parent 496a288064
commit 4eac013087
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/microdot/microdot.py
View File

@@ -520,8 +520,10 @@ class Response:
:param body: The body of the response. If a dictionary or list is given, :param body: The body of the response. If a dictionary or list is given,
a JSON formatter is used to generate the body. If a file-like a JSON formatter is used to generate the body. If a file-like
object or an async generator is given, a streaming response is object or an async generator is given, a streaming response is
used. If a string is given, it is encoded from UTF-8. Else, used. If a string is given, it is encoded from UTF-8. If an
the body should be a byte sequence. integer is given and ``status_code`` isn't given, then the
status code is assigned and the body is kept empty. Else, the
body should be a byte sequence.
:param status_code: The numeric HTTP status code of the response. The :param status_code: The numeric HTTP status code of the response. The
default is 200. default is 200.
:param headers: A dictionary of headers to include in the response. :param headers: A dictionary of headers to include in the response.
@@ -554,11 +556,14 @@ class Response:
#: written to the client. Used to exit WebSocket connections cleanly. #: written to the client. Used to exit WebSocket connections cleanly.
already_handled = None already_handled = None
def __init__(self, body='', status_code=200, headers=None, reason=None): def __init__(self, body='', status_code=None, headers=None, reason=None):
if body is None and status_code == 200: if body is None and status_code is None:
body = '' body = ''
status_code = 204 status_code = 204
self.status_code = status_code elif isinstance(body, int) and status_code is None:
status_code = int(body)
body = ''
self.status_code = status_code or 200
self.headers = NoCaseDict(headers or {}) self.headers = NoCaseDict(headers or {})
self.reason = reason self.reason = reason
if isinstance(body, (dict, list)): if isinstance(body, (dict, list)):

16
tests/test_response.py
View File

@@ -109,6 +109,18 @@ class TestResponse(unittest.TestCase):
fd.response) fd.response)
self.assertTrue(fd.response.endswith(b'\r\n\r\n[1, "2"]')) self.assertTrue(fd.response.endswith(b'\r\n\r\n[1, "2"]'))
def test_create_status_code(self):
res = Response(202)
self.assertEqual(res.status_code, 202)
self.assertEqual(res.body, b'')
fd = FakeStreamAsync()
self._run(res.write(fd))
self.assertIn(b'HTTP/1.0 202 N/A\r\n', fd.response)
self.assertIn(b'Content-Length: 0\r\n', fd.response)
self.assertIn(b'Content-Type: text/plain; charset=UTF-8\r\n',
fd.response)
self.assertTrue(fd.response.endswith(b'\r\n\r\n'))
def test_create_from_none(self): def test_create_from_none(self):
res = Response(None) res = Response(None)
self.assertEqual(res.status_code, 204) self.assertEqual(res.status_code, 204)
@@ -136,10 +148,10 @@ class TestResponse(unittest.TestCase):
self.assertTrue(fd.response.endswith(b'\r\n\r\nfoobar')) self.assertTrue(fd.response.endswith(b'\r\n\r\nfoobar'))
def test_create_from_other(self): def test_create_from_other(self):
res = Response(123) res = Response(23.7)
self.assertEqual(res.status_code, 200) self.assertEqual(res.status_code, 200)
self.assertEqual(res.headers, {}) self.assertEqual(res.headers, {})
self.assertEqual(res.body, 123) self.assertEqual(res.body, 23.7)
def test_create_with_status_code(self): def test_create_with_status_code(self):
res = Response('not found', 404) res = Response('not found', 404)