diff options
| author | Mark Aaron Shirley | 2013-04-16 09:55:47 -0700 |
|---|---|---|
| committer | Mark Aaron Shirley | 2013-04-16 09:55:47 -0700 |
| commit | c7e000e46e831a254689faac44ea44ebafe3cd61 (patch) | |
| tree | f3b3ed8c258b82b3dfb1939404f00f5fb16b7c1c /rest_framework/tests/pagination.py | |
| parent | bda25479aa7e73c90bc77b7c7219eaa411af138e (diff) | |
| parent | 23289b023db230f73e4a5bfae24a56c79e3fcd4b (diff) | |
| download | django-rest-framework-c7e000e46e831a254689faac44ea44ebafe3cd61.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer
Conflicts:
docs/api-guide/serializers.md
Diffstat (limited to 'rest_framework/tests/pagination.py')
| -rw-r--r-- | rest_framework/tests/pagination.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/rest_framework/tests/pagination.py b/rest_framework/tests/pagination.py index d2c9b051..6b8ef02f 100644 --- a/rest_framework/tests/pagination.py +++ b/rest_framework/tests/pagination.py @@ -129,16 +129,6 @@ class IntegrationTestPaginationAndFiltering(TestCase): view = FilterFieldsRootView.as_view() EXPECTED_NUM_QUERIES = 2 - if django.VERSION < (1, 4): - # On Django 1.3 we need to use django-filter 0.5.4 - # - # The filter objects there don't expose a `.count()` method, - # which means we only make a single query *but* it's a single - # query across *all* of the queryset, instead of a COUNT and then - # a SELECT with a LIMIT. - # - # Although this is fewer queries, it's actually a regression. - EXPECTED_NUM_QUERIES = 1 request = factory.get('/?decimal=15.20') with self.assertNumQueries(EXPECTED_NUM_QUERIES): |