From d37d54e62ee8e43b24571512aced3cba68ddb0d1 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 9 Dec 2015 14:45:13 +0000 Subject: [PATCH] Rename _get_val_from_obj to value_from_object value_from_object has been in Django for a long time. _get_val_from_obj is deprecated --- wagtail/wagtailcore/fields.py | 2 +- wagtail/wagtailsearch/index.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailcore/fields.py b/wagtail/wagtailcore/fields.py index 3b9e3fc097..17510448fa 100644 --- a/wagtail/wagtailcore/fields.py +++ b/wagtail/wagtailcore/fields.py @@ -119,7 +119,7 @@ class StreamField(with_metaclass(models.SubfieldBase, models.Field)): return super(StreamField, self).formfield(**defaults) def value_to_string(self, obj): - value = self._get_val_from_obj(obj) + value = self.value_from_object(obj) return self.get_prep_value(value) def get_searchable_content(self, value): diff --git a/wagtail/wagtailsearch/index.py b/wagtail/wagtailsearch/index.py index dc47b54d41..ece2ff24c6 100644 --- a/wagtail/wagtailsearch/index.py +++ b/wagtail/wagtailsearch/index.py @@ -123,7 +123,7 @@ class BaseField(object): def get_value(self, obj): try: field = self.get_field(obj.__class__) - value = field._get_val_from_obj(obj) + value = field.value_from_object(obj) if hasattr(field, 'get_searchable_content'): value = field.get_searchable_content(value) return value