Simplify '.content' by removing CONTENT_MISSING#1055
Merged
Kriechi merged 5 commits intomitmproxy:masterfrom Mar 27, 2016
MatthewShao:issue#963
Merged
Simplify '.content' by removing CONTENT_MISSING#1055Kriechi merged 5 commits intomitmproxy:masterfrom MatthewShao:issue#963
Kriechi merged 5 commits intomitmproxy:masterfrom
MatthewShao:issue#963
Conversation
mitmproxy/models/http.py
Outdated
| content: Content of the request, None, or CONTENT_MISSING if there | ||
| is content associated, but not present. CONTENT_MISSING evaluates | ||
| to False to make checking for the presence of content natural. | ||
| content: Content of the request, the value is None if there is content |
Member
There was a problem hiding this comment.
Ah yes - it's ok.
For some reason the Github diff view indicated a different class...
mitmproxy/web/app.py
Outdated
| if message["content"]: | ||
| message["contentLength"] = len(message["content"]) | ||
| elif message["content"] == CONTENT_MISSING: | ||
| elif message["content"] is None: |
Member
There was a problem hiding this comment.
This if elif else can be simplified to if else by combining the cases where content is not None.
Member
|
Other than my minor comments above, LGTM! 😃 |
Member
|
Thanks! 🎉 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 #963
As @mhils said, I did this in two step:
NonetoCONTENT_MISSING(to see if anything go wrong)CONTENT_MISSINGwithNoneThe relative comments and document have been updated too, hope I didn't miss anything.