From 389b48e3945b5e9b4f37593d57266f3226c5f87e Mon Sep 17 00:00:00 2001 From: Ryan Hiebert Date: Wed, 18 Nov 2015 08:19:27 -0600 Subject: [PATCH] Avoid making a new module for this function --- rest_framework/relations.py | 13 +++++++++++-- rest_framework/utils/overridden.py | 7 ------- 2 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 rest_framework/utils/overridden.py diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 00ca8ecbf..996fa9306 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -18,7 +18,16 @@ from rest_framework.fields import ( Field, empty, get_attribute, is_simple_callable, iter_options ) from rest_framework.reverse import reverse -from rest_framework.utils import html, overridden +from rest_framework.utils import html + + +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__ class Hyperlink(six.text_type): @@ -63,7 +72,7 @@ class RelatedField(Field): self.html_cutoff = kwargs.pop('html_cutoff', self.html_cutoff) self.html_cutoff_text = kwargs.pop('html_cutoff_text', self.html_cutoff_text) - if not overridden.method_overridden('get_queryset', RelatedField, self): + if not method_overridden('get_queryset', RelatedField, self): assert self.queryset is not None or kwargs.get('read_only', None), ( 'Relational field must provide a `queryset` argument, ' 'or set read_only=`True`.' diff --git a/rest_framework/utils/overridden.py b/rest_framework/utils/overridden.py deleted file mode 100644 index 5402916c7..000000000 --- a/rest_framework/utils/overridden.py +++ /dev/null @@ -1,7 +0,0 @@ -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__