mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-02-02 20:54:42 +03:00
Make factory.get work with Django 1.7
This commit is contained in:
parent
9c910a3f6d
commit
1319da59ce
|
@ -8,6 +8,7 @@ from django.conf import settings
|
||||||
from django.test.client import Client as DjangoClient
|
from django.test.client import Client as DjangoClient
|
||||||
from django.test.client import ClientHandler
|
from django.test.client import ClientHandler
|
||||||
from django.test import testcases
|
from django.test import testcases
|
||||||
|
from django.utils.http import urlencode
|
||||||
from rest_framework.settings import api_settings
|
from rest_framework.settings import api_settings
|
||||||
from rest_framework.compat import RequestFactory as DjangoRequestFactory
|
from rest_framework.compat import RequestFactory as DjangoRequestFactory
|
||||||
from rest_framework.compat import force_bytes_or_smart_bytes, six
|
from rest_framework.compat import force_bytes_or_smart_bytes, six
|
||||||
|
@ -71,9 +72,12 @@ class APIRequestFactory(DjangoRequestFactory):
|
||||||
|
|
||||||
return ret, content_type
|
return ret, content_type
|
||||||
|
|
||||||
def get(self, path, data=None, format=None, content_type=None, **extra):
|
def get(self, path, data=None, **extra):
|
||||||
data, content_type = self._encode_data(data, format, content_type)
|
r = {
|
||||||
return self.generic('GET', path, data, content_type, **extra)
|
'QUERY_STRING': urlencode(data or {}, doseq=True),
|
||||||
|
}
|
||||||
|
r.update(extra)
|
||||||
|
return self.generic('GET', path, **r)
|
||||||
|
|
||||||
def post(self, path, data=None, format=None, content_type=None, **extra):
|
def post(self, path, data=None, format=None, content_type=None, **extra):
|
||||||
data, content_type = self._encode_data(data, format, content_type)
|
data, content_type = self._encode_data(data, format, content_type)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user