Correctly handle headers of different types #152
Merged
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
justmobilize
commented
Jan 26, 2024
Comment on lines
+540
to
+542
| raise AttributeError( | ||
| f"Header part ({value}) from {key} must be of type str or bytes, not {type(value)}" | ||
| ) |
There was a problem hiding this comment.
in CPython requests this is:
raise InvalidHeader(
f"Invalid leading whitespace, reserved character(s), or return "
f"character(s) in header {header_kind}: {header_part!r}"
)
An AttributeError seems similar enough and didn't know if creating a new Exception would be wanted
| @@ -555,9 +567,14 @@ def _send_as_bytes(self, socket: SocketType, data: str): | |||
| return self._send(socket, bytes(data, "utf-8")) | |||
|
|
|||
| def _send_header(self, socket, header, value): | |||
| if value is None: | |||
There was a problem hiding this comment.
In CPython requests they have a method merge_setting
That they use in a bunch of places, but it creates new dict objects, and thought this would be simpler in memory usage
FoamyGuy
approved these changes
Feb 3, 2024
There was a problem hiding this comment.
This looks good to me. Agree with both of the points you mentioned in other comments.
Thanks for the fix @justmobilize!
I tested this successfully with a Feather ESP32S3 TFT with:
- requests simpletest
- adafruit io simpletest
- adafruit io http simpletest
All appear to function as intended with this version.
|
@FoamyGuy Can we release this library, is it picked up by Adabot? |
|
Yep, new release is made now. |
adafruit-adabot
added a commit
to adafruit/Adafruit_CircuitPython_Bundle
that referenced
this pull request
Feb 6, 2024
Updating https://github.com/adafruit/Adafruit_CircuitPython_DS18X20 to 1.4.0 from 1.3.19: > Merge pull request adafruit/Adafruit_CircuitPython_DS18X20#29 from ilikecake/main Updating https://github.com/adafruit/Adafruit_CircuitPython_FocalTouch to 1.5.2 from 1.5.1: > Merge pull request adafruit/Adafruit_CircuitPython_FocalTouch#32 from ilikecake/main Updating https://github.com/adafruit/Adafruit_CircuitPython_Seesaw to 1.16.2 from 1.16.1: > Merge pull request adafruit/Adafruit_CircuitPython_seesaw#129 from scirelli/issue_128 Updating https://github.com/adafruit/Adafruit_CircuitPython_Display_Button to 1.9.1 from 1.9.0: > Merge pull request adafruit/Adafruit_CircuitPython_Display_Button#44 from DJDevon3/DJDevon3_Working_Branch Updating https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout to 2.1.0 from 2.0.1: > Merge pull request adafruit/Adafruit_CircuitPython_DisplayIO_Layout#92 from FoamyGuy/gridlayout_cell_contains Updating https://github.com/adafruit/Adafruit_CircuitPython_HTTPServer to 4.5.3 from 4.5.1: > Merge pull request adafruit/Adafruit_CircuitPython_HTTPServer#79 from michalpokusa/cpython-fix > Merge pull request adafruit/Adafruit_CircuitPython_HTTPServer#78 from tedder/ted/cpython_port5k Updating https://github.com/adafruit/Adafruit_CircuitPython_LED_Animation to 2.9.0 from 2.8.0: > Merge pull request adafruit/Adafruit_CircuitPython_LED_Animation#116 from tylerwinfield/main Updating https://github.com/adafruit/Adafruit_CircuitPython_PyCamera to 0.0.9 from 0.0.8: > Merge pull request adafruit/Adafruit_CircuitPython_PyCamera#23 from adafruit/blendmode > Merge pull request adafruit/Adafruit_CircuitPython_PyCamera#22 from adafruit/timelapse > Merge pull request adafruit/Adafruit_CircuitPython_PyCamera#21 from adafruit/fix_rl Updating https://github.com/adafruit/Adafruit_CircuitPython_Requests to 2.0.5 from 2.0.4: > Merge pull request adafruit/Adafruit_CircuitPython_Requests#152 from justmobilize/fix-null-headers Updating https://github.com/adafruit/Adafruit_CircuitPython_Bundle/circuitpython_library_list.md to NA from NA: > Updated download stats for the libraries
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.
This stems from this issue in
Adafruit_CircuitPython_AdafruitIOthat caused this issue to be re-opened.If this path looks good I will add tests for the changes.