diff options
| author | Tom Christie | 2013-03-30 15:40:11 +0000 |
|---|---|---|
| committer | Tom Christie | 2013-03-30 15:40:11 +0000 |
| commit | 399ac70b831d782b7d774950b59f3b2066ab86f7 (patch) | |
| tree | e123ad7e60bd45a7e5ba1fe12d596d200cb2392e /rest_framework/tests/pagination.py | |
| parent | c4eda3a653ada3110dd6c128f176b15071cb8cfe (diff) | |
| parent | 2e06f5c832479c8802f8bd8654fba5597ee228cc (diff) | |
| download | django-rest-framework-399ac70b831d782b7d774950b59f3b2066ab86f7.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
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): |