Drop short status codes.

djangorestframework/status.py

@@ -47,46 +47,3 @@ HTTP_502_BAD_GATEWAY = 502
 HTTP_503_SERVICE_UNAVAILABLE = 503
 HTTP_504_GATEWAY_TIMEOUT = 504
 HTTP_505_HTTP_VERSION_NOT_SUPPORTED = 505
-
-# Short format
-CONTINUE = 100
-SWITCHING_PROTOCOLS = 101
-OK = 200
-CREATED = 201
-ACCEPTED = 202
-NON_AUTHORITATIVE_INFORMATION = 203
-NO_CONTENT = 204
-RESET_CONTENT = 205
-PARTIAL_CONTENT = 206
-MULTIPLE_CHOICES = 300
-MOVED_PERMANENTLY = 301
-FOUND = 302
-SEE_OTHER = 303
-NOT_MODIFIED = 304
-USE_PROXY = 305
-RESERVED = 306
-TEMPORARY_REDIRECT = 307
-BAD_REQUEST = 400
-UNAUTHORIZED = 401
-PAYMENT_REQUIRED = 402
-FORBIDDEN = 403
-NOT_FOUND = 404
-METHOD_NOT_ALLOWED = 405
-NOT_ACCEPTABLE = 406
-PROXY_AUTHENTICATION_REQUIRED = 407
-REQUEST_TIMEOUT = 408
-CONFLICT = 409
-GONE = 410
-LENGTH_REQUIRED = 411
-PRECONDITION_FAILED = 412
-REQUEST_ENTITY_TOO_LARGE = 413
-REQUEST_URI_TOO_LONG = 414
-UNSUPPORTED_MEDIA_TYPE = 415
-REQUESTED_RANGE_NOT_SATISFIABLE = 416
-EXPECTATION_FAILED = 417
-INTERNAL_SERVER_ERROR = 500
-NOT_IMPLEMENTED = 501
-BAD_GATEWAY = 502
-SERVICE_UNAVAILABLE = 503
-GATEWAY_TIMEOUT = 504
-HTTP_VERSION_NOT_SUPPORTED = 505

djangorestframework/tests/content.py

@@ -17,7 +17,7 @@ class MockView(View):
     authentication = (UserLoggedInAuthentication,)
     def post(self, request):
         if request.POST.get('example') is not None:
-            return Response(status.OK)
+            return Response(status.HTTP_200_OK)
 
         return Response(status.INTERNAL_SERVER_ERROR)
 
@@ -215,10 +215,10 @@ class TestContentParsingWithAuthentication(TestCase):
         content = {'example': 'example'}
 
         response = self.client.post('/', content)
-        self.assertEqual(status.OK, response.status_code, "POST data is malformed")
+        self.assertEqual(status.HTTP_200_OK, response.status_code, "POST data is malformed")
 
         response = self.csrf_client.post('/', content)
-        self.assertEqual(status.OK, response.status_code, "POST data is malformed")
+        self.assertEqual(status.HTTP_200_OK, response.status_code, "POST data is malformed")
 
     # def test_user_logged_in_authentication_has_post_when_logged_in(self):
     #     """Ensures request.POST exists after UserLoggedInAuthentication when user does log in"""

djangorestframework/tests/mixins.py

@@ -125,7 +125,7 @@ class MockPaginatorView(PaginatorMixin, View):
         return range(0, self.total)
 
     def post(self, request):
-        return Response(status.CREATED, {'status': 'OK'})
+        return Response(status.HTTP_201_CREATED, {'status': 'OK'})
 
 
 class TestPagination(TestCase):
@@ -139,7 +139,7 @@ class TestPagination(TestCase):
 
         content = json.loads(response.content)
 
-        self.assertEqual(response.status_code, status.OK)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(MockPaginatorView.total, content['total'])
         self.assertEqual(MockPaginatorView.limit, content['per_page'])
 
@@ -154,7 +154,7 @@ class TestPagination(TestCase):
 
         content = json.loads(response.content)
 
-        self.assertEqual(response.status_code, status.OK)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(content['per_page'], limit)
 
         self.assertEqual(range(0, limit), content['results'])
@@ -171,7 +171,7 @@ class TestPagination(TestCase):
 
         content = json.loads(response.content)
 
-        self.assertEqual(response.status_code, status.OK)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(MockPaginatorView.total, content['total'])
         self.assertEqual(limit, content['per_page'])
         self.assertEqual(num_pages, content['pages'])
@@ -188,7 +188,7 @@ class TestPagination(TestCase):
 
         content = json.loads(response.content)
 
-        self.assertEqual(response.status_code, status.OK)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(MockPaginatorView.total, content['total'])
         self.assertNotEqual(limit, content['per_page'])
         self.assertNotEqual(num_pages, content['pages'])
@@ -201,7 +201,7 @@ class TestPagination(TestCase):
 
         content = json.loads(response.content)
 
-        self.assertEqual(response.status_code, status.CREATED)
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(None, content.get('per_page'))
         self.assertEqual('OK', content['status'])
 
@@ -210,19 +210,19 @@ class TestPagination(TestCase):
         request = self.req.get('/paginator/?page=spam')
         response = MockPaginatorView.as_view()(request)
 
-        self.assertEqual(response.status_code, status.NOT_FOUND)
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
     def test_page_range(self):
         """ Tests that the page range is handle correctly """
         request = self.req.get('/paginator/?page=0')
         response = MockPaginatorView.as_view()(request)
         content = json.loads(response.content)
-        self.assertEqual(response.status_code, status.NOT_FOUND)
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
         request = self.req.get('/paginator/')
         response = MockPaginatorView.as_view()(request)
         content = json.loads(response.content)
-        self.assertEqual(response.status_code, status.OK)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(range(0, MockPaginatorView.limit), content['results'])
 
         num_pages = content['pages']
@@ -230,13 +230,13 @@ class TestPagination(TestCase):
         request = self.req.get('/paginator/?page=%d' % num_pages)
         response = MockPaginatorView.as_view()(request)
         content = json.loads(response.content)
-        self.assertEqual(response.status_code, status.OK)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(range(MockPaginatorView.limit*(num_pages-1), MockPaginatorView.total), content['results'])
 
         request = self.req.get('/paginator/?page=%d' % (num_pages + 1,))
         response = MockPaginatorView.as_view()(request)
         content = json.loads(response.content)
-        self.assertEqual(response.status_code, status.NOT_FOUND)
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
     def test_existing_query_parameters_are_preserved(self):
         """ Tests that existing query parameters are preserved when
@@ -244,7 +244,7 @@ class TestPagination(TestCase):
         request = self.req.get('/paginator/?foo=bar&another=something')
         response = MockPaginatorView.as_view()(request)
         content = json.loads(response.content)
-        self.assertEqual(response.status_code, status.OK)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertTrue('foo=bar' in content['next'])
         self.assertTrue('another=something' in content['next'])
         self.assertTrue('page=2' in content['next'])

djangorestframework/tests/status.py

@@ -8,9 +8,5 @@ class TestStatus(TestCase):
 
     def test_status(self):
         """Ensure the status module is present and correct."""
-        self.assertEquals(200, status.OK)
         self.assertEquals(200, status.HTTP_200_OK)
-
-        self.assertEquals(404, status.NOT_FOUND)
         self.assertEquals(404, status.HTTP_404_NOT_FOUND)
-