[3.6] fix: correct exceptions string format (#4068)

(cherry picked from commit 5d88cb0) Co-authored-by: 秋葉 <ambiguous404@gmail.com>
aio-libs · Sep 17, 2019 · 7169e65 · 7169e65
1 parent 3e0691c
commit 7169e65
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGES/4068.bugfix b/CHANGES/4068.bugfix
@@ -0,0 +1 @@
+correct some exception string format
diff --git a/aiohttp/http_websocket.py b/aiohttp/http_websocket.py
@@ -365,9 +365,12 @@ def _feed_data(self, data: bytes) -> Tuple[bool, bytes]:
                             left = len(self._decompressobj.unconsumed_tail)
                             raise WebSocketError(
                                 WSCloseCode.MESSAGE_TOO_BIG,
-                                "Decompressed message size exceeds limit {}".
-                                format(self._max_msg_size + left,
-                                       self._max_msg_size))
+                                "Decompressed message size {} exceeds limit {}"
+                                .format(
+                                    self._max_msg_size + left,
+                                    self._max_msg_size
+                                )
+                            )
                     else:
                         payload_merged = bytes(self._partial)
 

diff --git a/aiohttp/payload.py b/aiohttp/payload.py
@@ -207,7 +207,7 @@ def __init__(self,
                  *args: Any,
                  **kwargs: Any) -> None:
         if not isinstance(value, (bytes, bytearray, memoryview)):
-            raise TypeError("value argument must be byte-ish, not (!r)"
+            raise TypeError("value argument must be byte-ish, not {!r}"
                             .format(type(value)))
 
         if 'content_type' not in kwargs: