Graceful fallback if requests is not installed.

This commit is contained in:
Tom Christie 2016-08-17 12:11:01 +01:00
parent e76ca6eb88
commit 6ede654315
3 changed files with 78 additions and 68 deletions

View File

@ -178,6 +178,13 @@ except (ImportError, SyntaxError):
uritemplate = None
# requests is optional
try:
import requests
except ImportError:
requests = None
# Django-guardian is optional. Import only if guardian is in INSTALLED_APPS
# Fixes (#1712). We keep the try/except for the test suite.
guardian = None

View File

@ -15,12 +15,8 @@ from django.test.client import ClientHandler
from django.utils import six
from django.utils.encoding import force_bytes
from django.utils.http import urlencode
from requests import Session
from requests.adapters import BaseAdapter
from requests.models import Response
from requests.structures import CaseInsensitiveDict
from requests.utils import get_encoding_from_headers
from rest_framework.compat import requests
from rest_framework.settings import api_settings
@ -29,7 +25,8 @@ def force_authenticate(request, user=None, token=None):
request._force_auth_token = token
class DjangoTestAdapter(BaseAdapter):
if requests is not None:
class DjangoTestAdapter(requests.adapters.BaseAdapter):
"""
A transport adapter for `requests`, that makes requests via the
Django WSGI app, rather than making actual HTTP requests over the network.
@ -65,14 +62,14 @@ class DjangoTestAdapter(BaseAdapter):
"""
Make an outgoing request to the Django WSGI application.
"""
response = Response()
response = requests.models.Response()
def start_response(status, headers):
status_code, _, reason_phrase = status.partition(' ')
response.status_code = int(status_code)
response.reason = reason_phrase
response.headers = CaseInsensitiveDict(headers)
response.encoding = get_encoding_from_headers(response.headers)
response.headers = requests.structures.CaseInsensitiveDict(headers)
response.encoding = requests.utils.get_encoding_from_headers(response.headers)
environ = self.get_environ(request)
raw_bytes = self.app(environ, start_response)
@ -86,8 +83,7 @@ class DjangoTestAdapter(BaseAdapter):
def close(self):
pass
class DjangoTestSession(Session):
class DjangoTestSession(requests.Session):
def __init__(self, *args, **kwargs):
super(DjangoTestSession, self).__init__(*args, **kwargs)
@ -306,9 +302,12 @@ class APITransactionTestCase(testcases.TransactionTestCase):
class APITestCase(testcases.TestCase):
client_class = APIClient
def _pre_setup(self):
super(APITestCase, self)._pre_setup()
self.requests = DjangoTestSession()
@property
def requests(self):
if not hasattr(self, '_requests'):
assert requests is not None, 'requests must be installed'
self._requests = DjangoTestSession()
return self._requests
class APISimpleTestCase(testcases.SimpleTestCase):

View File

@ -1,8 +1,11 @@
from __future__ import unicode_literals
import unittest
from django.conf.urls import url
from django.test import override_settings
from rest_framework.compat import requests
from rest_framework.response import Response
from rest_framework.test import APITestCase
from rest_framework.views import APIView
@ -37,7 +40,7 @@ class Root(APIView):
class Headers(APIView):
def get(self, request):
headers = {
key[5:]: value
key[5:].replace('_', '-'): value
for key, value in request.META.items()
if key.startswith('HTTP_')
}
@ -53,6 +56,7 @@ urlpatterns = [
]
@unittest.skipUnless(requests, 'requests not installed')
@override_settings(ROOT_URLCONF='tests.test_requests_client')
class RequestsClientTests(APITestCase):
def test_get_request(self):