ensure our boundary matches: improve the message (#124)

* ensure our boundary matches: improve the message The error message should report expected actual mismatch. * improve syntax * use walrus operator * Oops, walrus not supported * reverse random paste * Test multi parser error boundary mismatch error message * Fix expected error message * rebase --------- Co-authored-by: Marcelo Trylesinski <[email protected]>
Kludex · Sep 29, 2024 · 83191cb · 83191cb
1 parent a169d93
commit 83191cb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/multipart/multipart.py b/multipart/multipart.py
@@ -1150,7 +1150,7 @@ def data_callback(name: CallbackName, end_i: int, remaining: bool = False) -> No
                 else:
                     # Check to ensure our boundary matches
                     if c != boundary[index + 2]:
-                        msg = "Did not find boundary character %r at index " "%d" % (c, index + 2)
+                        msg = "Expected boundary character %r, got %r at index %d" % (boundary[index + 2], c, index + 2)
                         self.logger.warning(msg)
                         e = MultipartParseError(msg)
                         e.offset = i

diff --git a/tests/test_multipart.py b/tests/test_multipart.py
@@ -1057,7 +1057,12 @@ def test_bad_start_boundary(self) -> None:
         self.make("boundary")
         data = b"--boundaryfoobar"
         with self.assertRaises(MultipartParseError):
-            i = self.f.write(data)
+            self.f.write(data)
+
+        self.make("boundary")
+        data = b"--Boundary\r\nfoobar"
+        with self.assertRaisesRegex(MultipartParseError, "Expected boundary character %r, got %r" % (b"b"[0], b"B"[0])):
+            self.f.write(data)
 
     def test_octet_stream(self) -> None:
         files: list[File] = []