Per RFC-6585, Tastypie now returns HTTP 429 when the throttle limit i…

…s exceeded.

docs/testing.rst

@@ -304,6 +304,13 @@ Ensures the response is returning a HTTP 409.
 
 Ensures the response is returning a HTTP 410.
 
+``assertHttpTooManyRequests``
+~~~~~~~~~~~~~~~~~~~
+
+.. method:: ResourceTestCase.assertHttpTooManyRequests(self, resp)
+
+Ensures the response is returning a HTTP 429.
+
 ``assertHttpApplicationError``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

tastypie/http.py

@@ -6,14 +6,14 @@
 
 class HttpCreated(HttpResponse):
     status_code = 201
-    
+
     def __init__(self, *args, **kwargs):
         location = ''
 
         if 'location' in kwargs:
             location = kwargs['location']
             del(kwargs['location'])
-        
+
         super(HttpCreated, self).__init__(*args, **kwargs)
         self['Location'] = location
 
@@ -66,6 +66,10 @@ class HttpGone(HttpResponse):
     status_code = 410
 
 
+class HttpTooManyRequests(HttpResponse):
+    status_code = 429
+
+
 class HttpApplicationError(HttpResponse):
     status_code = 500
 

tastypie/resources.py

@@ -546,7 +546,7 @@ def throttle_check(self, request):
         # Check to see if they should be throttled.
         if self._meta.throttle.should_be_throttled(identifier):
             # Throttle limit exceeded.
-            raise ImmediateHttpResponse(response=http.HttpForbidden())
+            raise ImmediateHttpResponse(response=http.HttpTooManyRequests())
 
     def log_throttled_access(self, request):
         """

tastypie/test.py

@@ -381,6 +381,12 @@ def assertHttpGone(self, resp):
         """
         return self.assertEqual(resp.status_code, 410)
 
+    def assertHttpTooManyRequests(self, resp):
+        """
+        Ensures the response is returning a HTTP 429.
+        """
+        return self.assertEqual(resp.status_code, 429)
+
     def assertHttpApplicationError(self, resp):
         """
         Ensures the response is returning a HTTP 500.

tests/core/tests/http.py

@@ -32,5 +32,7 @@ def test_various_statuses(self):
         self.assertEqual(conflict.status_code, 409)
         gone = HttpGone()
         self.assertEqual(gone.status_code, 410)
+        toomanyrequests = HttpTooManyRequests()
+        self.assertEqual(toomanyrequests.status_code, 429)
         not_implemented = HttpNotImplemented()
         self.assertEqual(not_implemented.status_code, 501)

tests/core/tests/resources.py

@@ -2239,20 +2239,20 @@ def test_check_throttling(self):
             resp = resource.dispatch('list', request)
             self.fail()
         except ImmediateHttpResponse, e:
-            self.assertEqual(e.response.status_code, 403)
+            self.assertEqual(e.response.status_code, 429)
             self.assertEqual(len(cache.get('noaddr_nohost_accesses')), 2)
 
         # Throttled.
         try:
             resp = resource.dispatch('list', request)
             self.fail()
         except ImmediateHttpResponse, e:
-            self.assertEqual(e.response.status_code, 403)
+            self.assertEqual(e.response.status_code, 429)
             self.assertEqual(len(cache.get('noaddr_nohost_accesses')), 2)
 
         # Check the ``wrap_view``.
         resp = resource.wrap_view('dispatch_list')(request)
-        self.assertEqual(resp.status_code, 403)
+        self.assertEqual(resp.status_code, 429)
         self.assertEqual(len(cache.get('noaddr_nohost_accesses')), 2)
 
         # Restore.