Skip to content

Commit 0fff602

Browse files
committed
Replaced public header_body_bytes by private methods
1 parent 0850aba commit 0fff602

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

adafruit_httpserver/request.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def __init__(
8383
if raw_request is None:
8484
raise ValueError("raw_request cannot be None")
8585

86-
header_bytes = self.header_body_bytes[0]
86+
header_bytes = self._raw_header_bytes
8787

8888
try:
8989
(
@@ -99,21 +99,25 @@ def __init__(
9999
@property
100100
def body(self) -> bytes:
101101
"""Body of the request, as bytes."""
102-
return self.header_body_bytes[1]
102+
return self._raw_body_bytes
103103

104104
@body.setter
105105
def body(self, body: bytes) -> None:
106-
self.raw_request = self.header_body_bytes[0] + b"\r\n\r\n" + body
106+
self.raw_request = self._raw_header_bytes + b"\r\n\r\n" + body
107107

108108
@property
109-
def header_body_bytes(self) -> Tuple[bytes, bytes]:
110-
"""Return tuple of header and body bytes."""
109+
def _raw_header_bytes(self) -> bytes:
110+
"""Returns headers bytes."""
111+
empty_line_index = self.raw_request.find(b"\r\n\r\n")
112+
113+
return self.raw_request[:empty_line_index]
111114

115+
@property
116+
def _raw_body_bytes(self) -> bytes:
117+
"""Returns body bytes."""
112118
empty_line_index = self.raw_request.find(b"\r\n\r\n")
113-
header_bytes = self.raw_request[:empty_line_index]
114-
body_bytes = self.raw_request[empty_line_index + 4 :]
115119

116-
return header_bytes, body_bytes
120+
return self.raw_request[empty_line_index + 4 :]
117121

118122
@staticmethod
119123
def _parse_start_line(header_bytes: bytes) -> Tuple[str, str, Dict[str, str], str]:

0 commit comments

Comments
 (0)