Make factory.get work with Django 1.7

1 files changed, 7 insertions, 3 deletions

diff --git a/rest_framework/test.py b/rest_framework/test.py
index 23a31ee4..75cb4d0b 100644
--- a/rest_framework/test.py
+++ b/rest_framework/test.py
@@ -8,6 +8,7 @@ from django.conf import settings
 from django.test.client import Client as DjangoClient
 from django.test.client import ClientHandler
 from django.test import testcases
+from django.utils.http import urlencode
 from rest_framework.settings import api_settings
 from rest_framework.compat import RequestFactory as DjangoRequestFactory
 from rest_framework.compat import force_bytes_or_smart_bytes, six
@@ -71,9 +72,12 @@ class APIRequestFactory(DjangoRequestFactory):
 
         return ret, content_type
 
-    def get(self, path, data=None, format=None, content_type=None, **extra):
-        data, content_type = self._encode_data(data, format, content_type)
-        return self.generic('GET', path, data, content_type, **extra)
+    def get(self, path, data=None, **extra):
+        r = {
+            '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):
         data, content_type = self._encode_data(data, format, content_type)