Skip to content
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

Jump to bottom

More robust check for upload files in binary mode #2630

Merged
merged 7 commits into from
Apr 20, 2023
Merged

More robust check for upload files in binary mode #2630

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
53bdae2
Fix check for binary mode
lkuchenb Mar 21, 2023
4746044
Change order of type checks
lkuchenb Mar 21, 2023
946c1ff
Merge branch 'master' into fix/multipart_filemode_check
lkuchenb Apr 3, 2023
9c3ff10
Merge branch 'master' into fix/multipart_filemode_check
tomchristie Apr 5, 2023
1fed1c2
Merge branch 'master' into fix/multipart_filemode_check
tomchristie Apr 11, 2023
105989c
Merge branch 'master' into fix/multipart_filemode_check
tomchristie Apr 19, 2023
fd3ca97
Merge branch 'master' into fix/multipart_filemode_check
tomchristie Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions httpx/_multipart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,14 @@ def __init__(self, name: str, value: FileTypes) -> None:
# requests does the opposite (it overwrites the header with the 3rd tuple element)
headers["Content-Type"] = content_type

if "b" not in getattr(fileobj, "mode", "b"):
raise TypeError(
"Multipart file uploads must be opened in binary mode, not text mode."
)
if isinstance(fileobj, io.StringIO):
raise TypeError(
"Multipart file uploads require 'io.BytesIO', not 'io.StringIO'."
)
if isinstance(fileobj, io.TextIOBase):
raise TypeError(
"Multipart file uploads must be opened in binary mode, not text mode."
)

self.filename = filename
self.file = fileobj
Expand Down