excludes requests 2.18.0 from compatible versions #1646
Merged
Conversation
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
|
Please sign your commits following these rules: $ git clone -b "patch-1" git@github.com:mattoberle/docker-py.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -fAmending updates the existing PR. You DO NOT need to open a new one. |
The 2.18.0 version of requests breaks compatibility with docker-py: psf/requests#4160 [This block](https://github.com/shazow/urllib3/blob/master/urllib3/connectionpool.py#L292) of code from urllib3 fails: ```python def _get_timeout(self, timeout): """ Helper that always returns a :class:`urllib3.util.Timeout` """ if timeout is _Default: return self.timeout.clone() if isinstance(timeout, Timeout): return timeout.clone() else: # User passed us an int/float. This is for backwards compatibility, # can be removed later return Timeout.from_float(timeout) ``` In the case of requests version 2.18.0: `timeout` was an instance of `urllib3.util.timeout.Timeout` `Timeout` was an instance of `requests.packages.urllib3.util.timeout.Timeout` When the `isinstance(timeout, Timeout)` check fails the `urllib3.util.timeout.Timeout` object is passed as the `connection` argument to `requests.packages.urllib3.util.timeout.Timeout.from_float`. Signed-off-by: Matt Oberle <matt.r.oberle@gmail.com>
|
LGTM, thank you! |
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.
The 2.18.0 version of requests breaks compatibility with docker-py:
psf/requests#4160
This block of code from urllib3 fails:
In the case of requests version 2.18.0:
timeoutwas an instance ofurllib3.util.timeout.TimeoutTimeoutwas an instance ofrequests.packages.urllib3.util.timeout.TimeoutWhen the
isinstance(timeout, Timeout)check fails theurllib3.util.timeout.Timeoutobject is passed as theconnectionargument torequests.packages.urllib3.util.timeout.Timeout.from_float.