This repository was archived by the owner on Apr 14, 2022. It is now read-only.
Merge from master (June 6th, 2019) #119
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
…om-master-2019-06-19 Technically this is not a merge, because I redid everything myself. When I had doubt, I did look at the original commit, and followed what it did. Except for one thing: I always remove empty lines after the added `with` statement. I would like to do the same thing upstream to make future merges easier.
| @@ -22,343 +22,332 @@ def setUp(self): | |||
| self.proxy_url = "http://%s:%d" % (self.proxy_host, self.proxy_port) | |||
|
|
|||
| def test_basic_proxy(self): | |||
| http = proxy_from_url(self.proxy_url, ca_certs=DEFAULT_CA) | |||
| self.addCleanup(http.clear) | |||
| with proxy_from_url(self.proxy_url, ca_certs=DEFAULT_CA) as http: | |||
There was a problem hiding this comment.
Should we change proxy_from_url to just ProxyManager calls ?
There was a problem hiding this comment.
Sure, but not as part of this PR (because yours did not that either, probaby because it would have been a breaking change). I added it to my list in #114 so I won't forget it.
There was a problem hiding this comment.
Then I think it's ready to to be merged.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 removes the addCleanup() calls. This is the only remaining big change, the next one is simply to drop unittest altogether.