encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-02 20:54:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removed router check for deprecated '.model' attribute

Browse Source
This commit is contained in:
Tymur Maryokhin 2015-01-29 17:28:03 +01:00
parent 60a63ffd29
commit ba7dca893c
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rest_framework/routers.py
View File

@ -130,19 +130,13 @@ class SimpleRouter(BaseRouter):
If `base_name` is not specified, attempt to automatically determine If `base_name` is not specified, attempt to automatically determine
it from the viewset. it from the viewset.
""" """
# Note that `.model` attribute on views is deprecated, although we
# enforce the deprecation on the view `get_serializer_class()` and
# `get_queryset()` methods, rather than here.
model_cls = getattr(viewset, 'model', None)
queryset = getattr(viewset, 'queryset', None) queryset = getattr(viewset, 'queryset', None)
if model_cls is None and queryset is not None:
model_cls = queryset.model
assert model_cls, '`base_name` argument not specified, and could ' \ assert queryset is not None, '`base_name` argument not specified, and could ' \
'not automatically determine the name from the viewset, as ' \ 'not automatically determine the name from the viewset, as ' \
'it does not have a `.queryset` attribute.' 'it does not have a `.queryset` attribute.'
return model_cls._meta.object_name.lower() return queryset.model._meta.object_name.lower()
def get_routes(self, viewset): def get_routes(self, viewset):
""" """

7
tests/test_routers.py
View File

@ -180,7 +180,7 @@ class TestLookupValueRegex(TestCase):
class TestTrailingSlashIncluded(TestCase): class TestTrailingSlashIncluded(TestCase):
def setUp(self): def setUp(self):
class NoteViewSet(viewsets.ModelViewSet): class NoteViewSet(viewsets.ModelViewSet):
model = RouterTestModel queryset = RouterTestModel.objects.all()
self.router = SimpleRouter() self.router = SimpleRouter()
self.router.register(r'notes', NoteViewSet) self.router.register(r'notes', NoteViewSet)
@ -195,7 +195,7 @@ class TestTrailingSlashIncluded(TestCase):
class TestTrailingSlashRemoved(TestCase): class TestTrailingSlashRemoved(TestCase):
def setUp(self): def setUp(self):
class NoteViewSet(viewsets.ModelViewSet): class NoteViewSet(viewsets.ModelViewSet):
model = RouterTestModel queryset = RouterTestModel.objects.all()
self.router = SimpleRouter(trailing_slash=False) self.router = SimpleRouter(trailing_slash=False)
self.router.register(r'notes', NoteViewSet) self.router.register(r'notes', NoteViewSet)
@ -210,7 +210,8 @@ class TestTrailingSlashRemoved(TestCase):
class TestNameableRoot(TestCase): class TestNameableRoot(TestCase):
def setUp(self): def setUp(self):
class NoteViewSet(viewsets.ModelViewSet): class NoteViewSet(viewsets.ModelViewSet):
model = RouterTestModel queryset = RouterTestModel.objects.all()
self.router = DefaultRouter() self.router = DefaultRouter()
self.router.root_view_name = 'nameable-root' self.router.root_view_name = 'nameable-root'
self.router.register(r'notes', NoteViewSet) self.router.register(r'notes', NoteViewSet)