Merge pull request #213 from marsam/master

Use request.data in DRF >=  3

Author: jpadilla

rest_framework_jwt/compat.py

@@ -5,7 +5,12 @@
 from django.forms import widgets
 
 
-if StrictVersion(rest_framework.VERSION) < StrictVersion('3.0.0'):
+DRF_VERSION_INFO = StrictVersion(rest_framework.VERSION).version
+DRF2 = DRF_VERSION_INFO[0] == 2
+DRF3 = DRF_VERSION_INFO[0] == 3
+
+
+if DRF2:
     class Serializer(serializers.Serializer):
         pass
 
@@ -57,10 +62,8 @@ def get_username(user):
 
 
 def get_request_data(request):
-    if getattr(request, 'data', None):
-        data = request.data
-    else:
-        # DRF < 3.2
+    if DRF2:
         data = request.DATA
-
+    else:
+        data = request.data
     return data

tests/test_compat.py

@@ -19,6 +19,13 @@ def test_get_request_data(self):
 
         assert get_request_data(request) == {'a': 'b'}
 
+    def test_get_request_data_empty(self):
+        data = ''
+        post = self.factory.post('/', data, content_type='application/json')
+        request = Request(post, parsers=[JSONParser()])
+
+        assert get_request_data(request) == {}
+
     def test_get_request_data_invalid(self):
         data = '{a:b}'
         post = self.factory.post('/', data, content_type='application/json')