Skip to content

Commit

Permalink
Make compatible with requests 1.2
Browse files Browse the repository at this point in the history
Stub out the httplib.HTTPResponse so that we can be compatible with
Requests < 2.3. We need this to be packaged in major systems that still
have older requests.

Change-Id: Ibec3cead76b7246a6987f9f3b3fef5df6bcc7bc8
  • Loading branch information
Jamie Lennox committed Aug 5, 2014
1 parent a6c0b3c commit eadbe7b
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 2 deletions.
46 changes: 46 additions & 0 deletions requests_mock/compat.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

import requests


def _versiontuple(v):
return tuple(map(int, (v.split("."))))


_requests_version = _versiontuple(requests.__version__)


if _requests_version < (2, 3):

# NOTE(jamielennox): There is a problem with requests < 2.3.0 such that it
# needs a httplib message for use with cookie extraction. It has been fixed
# but it is needed until we can rely on a recent enough requests version.

class _FakeHTTPMessage(object):

def getheaders(self, name):
return None

class _FakeHTTPResponse(object):

def __init__(self):
self.msg = _FakeHTTPMessage()

def isclosed(self):
# Don't let urllib try to close me
return False

_fake_http_response = _FakeHTTPResponse()

else:
_fake_http_response = None
5 changes: 4 additions & 1 deletion requests_mock/response.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
from requests.packages.urllib3.response import HTTPResponse
import six

from requests_mock import compat

_BODY_ARGS = frozenset(['raw', 'body', 'content', 'text', 'json'])
_HTTP_ARGS = frozenset(['status_code', 'reason', 'headers'])

Expand Down Expand Up @@ -87,7 +89,8 @@ def create_response(request, **kwargs):
reason=kwargs.get('reason'),
body=body or six.BytesIO(six.b('')),
decode_content=False,
preload_content=False)
preload_content=False,
original_response=compat._fake_http_response)

response = _http_adapter.build_response(request, raw)
response.connection = _FakeConnection()
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
requests>=2.3
requests>=1.1
six

0 comments on commit eadbe7b

Please sign in to comment.