encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-05-24 23:39:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make the override check a utility function

Browse Source
This commit is contained in:
Ryan Hiebert 2015-11-16 12:21:58 -06:00
parent fe12816b82
commit dca2de3a5c
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/relations.py
View File

@ -18,7 +18,7 @@ from rest_framework.fields import (
Field, empty, get_attribute, is_simple_callable, iter_options Field, empty, get_attribute, is_simple_callable, iter_options
) )
from rest_framework.reverse import reverse from rest_framework.reverse import reverse
from rest_framework.utils import html from rest_framework.utils import html, overridden
class Hyperlink(six.text_type): class Hyperlink(six.text_type):
@ -63,9 +63,7 @@ class RelatedField(Field):
self.html_cutoff = kwargs.pop('html_cutoff', self.html_cutoff) self.html_cutoff = kwargs.pop('html_cutoff', self.html_cutoff)
self.html_cutoff_text = kwargs.pop('html_cutoff_text', self.html_cutoff_text) self.html_cutoff_text = kwargs.pop('html_cutoff_text', self.html_cutoff_text)
default_get_queryset = getattr(RelatedField.get_queryset, '__func__', if not overridden.method_overridden('get_queryset', RelatedField, self):
RelatedField.get_queryset) # Python 2/3
if self.get_queryset.__func__ == default_get_queryset:
assert self.queryset is not None or kwargs.get('read_only', None), ( assert self.queryset is not None or kwargs.get('read_only', None), (
'Relational field must provide a `queryset` argument, ' 'Relational field must provide a `queryset` argument, '
'or set read_only=`True`.' 'or set read_only=`True`.'

7
rest_framework/utils/overridden.py Normal file
View File

@ -0,0 +1,7 @@
def method_overridden(method_name, klass, instance):
"""
Determine if a method has been overridden.
"""
method = getattr(klass, method_name)
default_method = getattr(method, '__func__', method) # Python 3 compat
return default_method is not getattr(instance, method_name).__func__