Commit 1c23b039 by Tom Christie

Merge branch 'master' of github.com:tomchristie/django-rest-framework

parents e7fd1660 12576275
......@@ -126,7 +126,6 @@ class APIView(View):
'Use `.all()` or call `.get_queryset()` instead.'
)
cls.queryset._fetch_all = force_evaluation
cls.queryset._result_iter = force_evaluation # Django <= 1.5
view = super(APIView, cls).as_view(**initkwargs)
view.cls = cls
......
......@@ -79,10 +79,6 @@ class ViewSetMixin(object):
handler = getattr(self, action)
setattr(self, method, handler)
# Patch this in as it's otherwise only present from 1.5 onwards
if hasattr(self, 'get') and not hasattr(self, 'head'):
self.head = self.get
# And continue as usual
return self.dispatch(request, *args, **kwargs)
......
......@@ -15,8 +15,8 @@ setenv =
PYTHONDONTWRITEBYTECODE=1
PYTHONWARNINGS=once
deps =
django18: Django==1.8.14
django19: Django==1.9.9
django18: Django==1.8.15
django19: Django==1.9.10
django110: Django==1.10
djangomaster: https://github.com/django/django/archive/master.tar.gz
-rrequirements/requirements-testing.txt
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment