Skip to content

Commit caa5792

Browse files
authored
Convert format calls to f-strings in WebSocket reader (#10638)
Small code cleanup
1 parent f7cac7e commit caa5792

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

aiohttp/_websocket/reader_py.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,8 @@ def _feed_data(self, data: bytes) -> None:
199199
if self._max_msg_size and len(self._partial) >= self._max_msg_size:
200200
raise WebSocketError(
201201
WSCloseCode.MESSAGE_TOO_BIG,
202-
"Message size {} exceeds limit {}".format(
203-
len(self._partial), self._max_msg_size
204-
),
202+
f"Message size {len(self._partial)} "
203+
f"exceeds limit {self._max_msg_size}",
205204
)
206205
continue
207206

@@ -220,7 +219,7 @@ def _feed_data(self, data: bytes) -> None:
220219
raise WebSocketError(
221220
WSCloseCode.PROTOCOL_ERROR,
222221
"The opcode in non-fin frame is expected "
223-
"to be zero, got {!r}".format(opcode),
222+
f"to be zero, got {opcode!r}",
224223
)
225224

226225
assembled_payload: Union[bytes, bytearray]
@@ -233,9 +232,8 @@ def _feed_data(self, data: bytes) -> None:
233232
if self._max_msg_size and len(assembled_payload) >= self._max_msg_size:
234233
raise WebSocketError(
235234
WSCloseCode.MESSAGE_TOO_BIG,
236-
"Message size {} exceeds limit {}".format(
237-
len(assembled_payload), self._max_msg_size
238-
),
235+
f"Message size {len(assembled_payload)} "
236+
f"exceeds limit {self._max_msg_size}",
239237
)
240238

241239
# Decompress process must to be done after all packets
@@ -252,9 +250,8 @@ def _feed_data(self, data: bytes) -> None:
252250
left = len(self._decompressobj.unconsumed_tail)
253251
raise WebSocketError(
254252
WSCloseCode.MESSAGE_TOO_BIG,
255-
"Decompressed message size {} exceeds limit {}".format(
256-
self._max_msg_size + left, self._max_msg_size
257-
),
253+
f"Decompressed message size {self._max_msg_size + left}"
254+
f" exceeds limit {self._max_msg_size}",
258255
)
259256
elif type(assembled_payload) is bytes:
260257
payload_merged = assembled_payload

0 commit comments

Comments
 (0)