Skip to content

ensure our boundary matches: improve the message #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 29, 2024
Merged

ensure our boundary matches: improve the message #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d1ad7b
ensure our boundary matches: improve the message
yecril23pl Feb 24, 2024
d09a383
improve syntax
yecril23pl Feb 24, 2024
1de9028
use walrus operator
yecril23pl Feb 24, 2024
b32ced7
Oops, walrus not supported
yecril23pl Feb 24, 2024
b527718
reverse random paste
yecril23pl Feb 24, 2024
926fd7a
Test multi parser error boundary mismatch error message
yecril23pl Feb 29, 2024
df62747
Fix expected error message
yecril23pl Feb 29, 2024
be23688
rebase
Kludex Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion multipart/multipart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion tests/test_multipart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] = []
Expand Down