Fix Content-Lenght calculation of unicode string #1484
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
florimondmanca
requested changes
Feb 28, 2021
|
Looks fiddly, just flagging up that I'd also like to be involved in any review on this. 😇 |
|
Great, thanks for this, good work! I'd like to see the change footprint reduced on it slightly. I don't think we really need to change |
tomchristie
reviewed
Mar 24, 2021
tomchristie
reviewed
Mar 24, 2021
| @@ -66,8 +62,6 @@ class FileField: | |||
| def __init__(self, name: str, value: FileTypes) -> None: | |||
| self.name = name | |||
|
|
|||
| fileobj: FileContent | |||
|
|
|||
There was a problem hiding this comment.
I'd suggest we don't change this.
tomchristie
reviewed
Mar 24, 2021
| # mismatch due to str -> bytes encoding. | ||
| # See: https://github.com/encode/httpx/issues/1482 | ||
| fileobj = to_bytes(fileobj) | ||
|
|
tomchristie
reviewed
Mar 24, 2021
| @@ -87,7 +87,7 @@ def __init__(self, name: str, value: FileTypes) -> None: | |||
| def get_length(self) -> int: | |||
| headers = self.render_headers() | |||
|
|
|||
| if isinstance(self.file, (str, bytes)): | |||
There was a problem hiding this comment.
The low-footprint change here is presumably to keep this check the same, but use the following...
return len(headers) + len(to_bytes(self.file))
Right?
tomchristie
reviewed
Mar 24, 2021
| @@ -119,8 +119,8 @@ def render_headers(self) -> bytes: | |||
| return self._headers | |||
|
|
|||
| def render_data(self) -> typing.Iterator[bytes]: | |||
| if isinstance(self.file, (str, bytes)): | |||
| yield to_bytes(self.file) | |||
There was a problem hiding this comment.
We shouldn't need to change this.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1482