Skip to content

Commit 4002f26

Browse files
committed
Moved _receive_request method
1 parent 8e0b86a commit 4002f26

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

adafruit_httpserver/server.py

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -234,32 +234,6 @@ def stop(self) -> None:
234234
if self.debug:
235235
_debug_stopped_server(self)
236236

237-
def _receive_request(
238-
self,
239-
sock: Union["SocketPool.Socket", "socket.socket"],
240-
client_address: Tuple[str, int],
241-
) -> Request:
242-
"""Receive bytes from socket until the whole request is received."""
243-
244-
# Receiving data until empty line
245-
header_bytes = self._receive_header_bytes(sock)
246-
247-
# Return if no data received
248-
if not header_bytes:
249-
return None
250-
251-
request = Request(self, sock, client_address, header_bytes)
252-
253-
content_length = int(request.headers.get_directive("Content-Length", 0))
254-
received_body_bytes = request.body
255-
256-
# Receiving remaining body bytes
257-
request.body = self._receive_body_bytes(
258-
sock, received_body_bytes, content_length
259-
)
260-
261-
return request
262-
263237
def _receive_header_bytes(
264238
self, sock: Union["SocketPool.Socket", "socket.socket"]
265239
) -> bytes:
@@ -296,6 +270,32 @@ def _receive_body_bytes(
296270
raise ex
297271
return received_body_bytes[:content_length]
298272

273+
def _receive_request(
274+
self,
275+
sock: Union["SocketPool.Socket", "socket.socket"],
276+
client_address: Tuple[str, int],
277+
) -> Request:
278+
"""Receive bytes from socket until the whole request is received."""
279+
280+
# Receiving data until empty line
281+
header_bytes = self._receive_header_bytes(sock)
282+
283+
# Return if no data received
284+
if not header_bytes:
285+
return None
286+
287+
request = Request(self, sock, client_address, header_bytes)
288+
289+
content_length = int(request.headers.get_directive("Content-Length", 0))
290+
received_body_bytes = request.body
291+
292+
# Receiving remaining body bytes
293+
request.body = self._receive_body_bytes(
294+
sock, received_body_bytes, content_length
295+
)
296+
297+
return request
298+
299299
def _handle_request(
300300
self, request: Request, handler: Union[Callable, None]
301301
) -> Union[Response, None]:

0 commit comments

Comments
 (0)