diff options
| author | Tom Christie | 2012-09-27 13:06:04 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-09-27 13:06:04 +0100 |
| commit | 91b3fb0b05778edeee48ea2a8cd8c784afa1a744 (patch) | |
| tree | 8655bf0921d5a6e3428178404510b8716d96c12e | |
| parent | ec3c0c288b37bb8a8999590a5f338fd8c70dc876 (diff) | |
| download | django-rest-framework-91b3fb0b05778edeee48ea2a8cd8c784afa1a744.tar.bz2 | |
Remove RequestFactory from compat (Now 1.2 is not supported)
| -rw-r--r-- | rest_framework/compat.py | 46 | ||||
| -rw-r--r-- | rest_framework/tests/decorators.py | 2 | ||||
| -rw-r--r-- | rest_framework/tests/files.py | 2 | ||||
| -rw-r--r-- | rest_framework/tests/mixins.py | 2 | ||||
| -rw-r--r-- | rest_framework/tests/parsers.py | 4 | ||||
| -rw-r--r-- | rest_framework/tests/request.py | 2 | ||||
| -rw-r--r-- | rest_framework/tests/throttling.py | 2 |
7 files changed, 7 insertions, 53 deletions
diff --git a/rest_framework/compat.py b/rest_framework/compat.py index fb3f67d9..ef713ed8 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -19,52 +19,6 @@ except ImportError: from cgi import parse_qs -# django.test.client.RequestFactory (Required for Django < 1.3) -try: - from django.test.client import RequestFactory -except ImportError: - from django.test import Client - from django.core.handlers.wsgi import WSGIRequest - - # From: http://djangosnippets.org/snippets/963/ - # Lovely stuff - class RequestFactory(Client): - """ - Class that lets you create mock :obj:`Request` objects for use in testing. - - Usage:: - - rf = RequestFactory() - get_request = rf.get('/hello/') - post_request = rf.post('/submit/', {'foo': 'bar'}) - - This class re-uses the :class:`django.test.client.Client` interface. Of which - you can find the docs here__. - - __ http://www.djangoproject.com/documentation/testing/#the-test-client - - Once you have a `request` object you can pass it to any :func:`view` function, - just as if that :func:`view` had been hooked up using a URLconf. - """ - def request(self, **request): - """ - Similar to parent class, but returns the :obj:`request` object as soon as it - has created it. - """ - environ = { - 'HTTP_COOKIE': self.cookies, - 'PATH_INFO': '/', - 'QUERY_STRING': '', - 'REQUEST_METHOD': 'GET', - 'SCRIPT_NAME': '', - 'SERVER_NAME': 'testserver', - 'SERVER_PORT': 80, - 'SERVER_PROTOCOL': 'HTTP/1.1', - } - environ.update(self.defaults) - environ.update(request) - return WSGIRequest(environ) - # django.views.generic.View (Django >= 1.3) try: from django.views.generic import View diff --git a/rest_framework/tests/decorators.py b/rest_framework/tests/decorators.py index 9aeaf7d8..4be53786 100644 --- a/rest_framework/tests/decorators.py +++ b/rest_framework/tests/decorators.py @@ -1,7 +1,7 @@ from django.test import TestCase from rest_framework import status from rest_framework.response import Response -from rest_framework.compat import RequestFactory +from django.test.client import RequestFactory from rest_framework.renderers import JSONRenderer from rest_framework.parsers import JSONParser from rest_framework.authentication import BasicAuthentication diff --git a/rest_framework/tests/files.py b/rest_framework/tests/files.py index eb5c7741..61d7f7b1 100644 --- a/rest_framework/tests/files.py +++ b/rest_framework/tests/files.py @@ -1,7 +1,7 @@ # from django.test import TestCase # from django import forms -# from rest_framework.compat import RequestFactory +# from django.test.client import RequestFactory # from rest_framework.views import View # from rest_framework.response import Response diff --git a/rest_framework/tests/mixins.py b/rest_framework/tests/mixins.py index def06464..8f6d64fb 100644 --- a/rest_framework/tests/mixins.py +++ b/rest_framework/tests/mixins.py @@ -1,7 +1,7 @@ # """Tests for the mixin module""" # from django.test import TestCase # from rest_framework import status -# from rest_framework.compat import RequestFactory +# from django.test.client import RequestFactory # from django.contrib.auth.models import Group, User # from rest_framework.mixins import CreateModelMixin, PaginatorMixin, ReadModelMixin # from rest_framework.resources import ModelResource diff --git a/rest_framework/tests/parsers.py b/rest_framework/tests/parsers.py index 4cafd660..8ab8a52f 100644 --- a/rest_framework/tests/parsers.py +++ b/rest_framework/tests/parsers.py @@ -1,7 +1,7 @@ # """ # .. # >>> from rest_framework.parsers import FormParser -# >>> from rest_framework.compat import RequestFactory +# >>> from django.test.client import RequestFactory # >>> from rest_framework.views import View # >>> from StringIO import StringIO # >>> from urllib import urlencode @@ -83,7 +83,7 @@ # import httplib, mimetypes # from tempfile import TemporaryFile # from django.test import TestCase -# from rest_framework.compat import RequestFactory +# from django.test.client import RequestFactory # from rest_framework.parsers import MultiPartParser # from rest_framework.views import View # from StringIO import StringIO diff --git a/rest_framework/tests/request.py b/rest_framework/tests/request.py index 402f9d1b..42274fcd 100644 --- a/rest_framework/tests/request.py +++ b/rest_framework/tests/request.py @@ -7,7 +7,7 @@ from django.test import TestCase, Client from rest_framework import status from rest_framework.authentication import SessionAuthentication -from rest_framework.compat import RequestFactory +from django.test.client import RequestFactory from rest_framework.parsers import ( FormParser, MultiPartParser, diff --git a/rest_framework/tests/throttling.py b/rest_framework/tests/throttling.py index 0058a28e..0b94c25b 100644 --- a/rest_framework/tests/throttling.py +++ b/rest_framework/tests/throttling.py @@ -6,7 +6,7 @@ from django.test import TestCase from django.contrib.auth.models import User from django.core.cache import cache -from rest_framework.compat import RequestFactory +from django.test.client import RequestFactory from rest_framework.views import APIView from rest_framework.throttling import UserRateThrottle from rest_framework.response import Response |
