Merge branch 'restframework2' of git://github.com/tomchristie/django-rest-framework into improved-view-decorators

* 'restframework2' of git://github.com/tomchristie/django-rest-framework: (56 commits)
  Bits of cleanup
  Add request.QUERY_PARAMS
  Add readonly 'id' field
  Tweak browseable API
  Don't display readonly fields
  Fix some bits of serialization
  Add csrf note
  Fix incorrect bit of tutorial
  Added tox.ini
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Clean up bits of templates etc
  Hack out bunch of unneccesary private methods on View class
  Clean up template tags
  Remove dumbass __all__ variables
  Remove old 'djangorestframework directories
  Change package name: djangorestframework -> rest_framework
  Dont strip final '/'
  Use get_script_prefix to play nicely if not installed at the root.
  ...

Conflicts:
	rest_framework/decorators.py

1 files changed, 0 insertions, 144 deletions

diff --git a/djangorestframework/tests/throttling.py b/djangorestframework/tests/throttling.py
deleted file mode 100644
index 3033614f..00000000
--- a/djangorestframework/tests/throttling.py
+++ /dev/null
@@ -1,144 +0,0 @@
-"""
-Tests for the throttling implementations in the permissions module.
-"""
-
-from django.test import TestCase
-from django.contrib.auth.models import User
-from django.core.cache import cache
-
-from djangorestframework.compat import RequestFactory
-from djangorestframework.views import APIView
-from djangorestframework.throttling import UserRateThrottle
-from djangorestframework.response import Response
-
-
-class User3SecRateThrottle(UserRateThrottle):
-    rate = '3/sec'
-    scope = 'seconds'
-
-
-class User3MinRateThrottle(UserRateThrottle):
-    rate = '3/min'
-    scope = 'minutes'
-
-
-class MockView(APIView):
-    throttle_classes = (User3SecRateThrottle,)
-
-    def get(self, request):
-        return Response('foo')
-
-
-class MockView_MinuteThrottling(APIView):
-    throttle_classes = (User3MinRateThrottle,)
-
-    def get(self, request):
-        return Response('foo')
-
-
-class ThrottlingTests(TestCase):
-    urls = 'djangorestframework.tests.throttling'
-
-    def setUp(self):
-        """
-        Reset the cache so that no throttles will be active
-        """
-        cache.clear()
-        self.factory = RequestFactory()
-
-    def test_requests_are_throttled(self):
-        """
-        Ensure request rate is limited
-        """
-        request = self.factory.get('/')
-        for dummy in range(4):
-            response = MockView.as_view()(request)
-        self.assertEqual(429, response.status_code)
-
-    def set_throttle_timer(self, view, value):
-        """
-        Explicitly set the timer, overriding time.time()
-        """
-        view.throttle_classes[0].timer = lambda self: value
-
-    def test_request_throttling_expires(self):
-        """
-        Ensure request rate is limited for a limited duration only
-        """
-        self.set_throttle_timer(MockView, 0)
-
-        request = self.factory.get('/')
-        for dummy in range(4):
-            response = MockView.as_view()(request)
-        self.assertEqual(429, response.status_code)
-
-        # Advance the timer by one second
-        self.set_throttle_timer(MockView, 1)
-
-        response = MockView.as_view()(request)
-        self.assertEqual(200, response.status_code)
-
-    def ensure_is_throttled(self, view, expect):
-        request = self.factory.get('/')
-        request.user = User.objects.create(username='a')
-        for dummy in range(3):
-            view.as_view()(request)
-        request.user = User.objects.create(username='b')
-        response = view.as_view()(request)
-        self.assertEqual(expect, response.status_code)
-
-    def test_request_throttling_is_per_user(self):
-        """
-        Ensure request rate is only limited per user, not globally for
-        PerUserThrottles
-        """
-        self.ensure_is_throttled(MockView, 200)
-
-    def ensure_response_header_contains_proper_throttle_field(self, view, expected_headers):
-        """
-        Ensure the response returns an X-Throttle field with status and next attributes
-        set properly.
-        """
-        request = self.factory.get('/')
-        for timer, expect in expected_headers:
-            self.set_throttle_timer(view, timer)
-            response = view.as_view()(request)
-            if expect is not None:
-                self.assertEquals(response['X-Throttle-Wait-Seconds'], expect)
-            else:
-                self.assertFalse('X-Throttle-Wait-Seconds' in response.headers)
-
-    def test_seconds_fields(self):
-        """
-        Ensure for second based throttles.
-        """
-        self.ensure_response_header_contains_proper_throttle_field(MockView,
-         ((0, None),
-          (0, None),
-          (0, None),
-          (0, '1')
-         ))
-
-    def test_minutes_fields(self):
-        """
-        Ensure for minute based throttles.
-        """
-        self.ensure_response_header_contains_proper_throttle_field(MockView_MinuteThrottling,
-         ((0, None),
-          (0, None),
-          (0, None),
-          (0, '60')
-         ))
-
-    def test_next_rate_remains_constant_if_followed(self):
-        """
-        If a client follows the recommended next request rate,
-        the throttling rate should stay constant.
-        """
-        self.ensure_response_header_contains_proper_throttle_field(MockView_MinuteThrottling,
-         ((0, None),
-          (20, None),
-          (40, None),
-          (60, None),
-          (80, None)
-         ))