From 035b0fa60da2e758d0ab7f9d04ef93cdb73c981f Mon Sep 17 00:00:00 2001
From: Thomas Stephenson <ovangle@gmail.com>
Date: Sun, 26 Apr 2015 16:30:46 +1000
Subject: Fixed #24716 -- Deprecated Field._get_val_from_obj()

The method duplicates the functionality of Field.value_from_object()
and has the additional downside of being a privately named public
API method.
---
 django/contrib/postgres/fields/array.py  | 2 +-
 django/contrib/postgres/fields/hstore.py | 3 +--
 django/contrib/postgres/fields/jsonb.py  | 2 +-
 django/contrib/postgres/fields/ranges.py | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'django/contrib/postgres/fields')

diff --git a/django/contrib/postgres/fields/array.py b/django/contrib/postgres/fields/array.py
index f9242f086b..9daea8e5c7 100644
--- a/django/contrib/postgres/fields/array.py
+++ b/django/contrib/postgres/fields/array.py
@@ -90,7 +90,7 @@ class ArrayField(Field):
 
     def value_to_string(self, obj):
         values = []
-        vals = self._get_val_from_obj(obj)
+        vals = self.value_from_object(obj)
         base_field = self.base_field
 
         for val in vals:
diff --git a/django/contrib/postgres/fields/hstore.py b/django/contrib/postgres/fields/hstore.py
index c87eef3bef..366c40052e 100644
--- a/django/contrib/postgres/fields/hstore.py
+++ b/django/contrib/postgres/fields/hstore.py
@@ -42,8 +42,7 @@ class HStoreField(Field):
         return value
 
     def value_to_string(self, obj):
-        value = self._get_val_from_obj(obj)
-        return json.dumps(value)
+        return json.dumps(self.value_from_object(obj))
 
     def formfield(self, **kwargs):
         defaults = {
diff --git a/django/contrib/postgres/fields/jsonb.py b/django/contrib/postgres/fields/jsonb.py
index eaf3e98d36..d580ea2efd 100644
--- a/django/contrib/postgres/fields/jsonb.py
+++ b/django/contrib/postgres/fields/jsonb.py
@@ -50,7 +50,7 @@ class JSONField(Field):
             )
 
     def value_to_string(self, obj):
-        value = self._get_val_from_obj(obj)
+        value = self.value_from_object(obj)
         return value
 
     def formfield(self, **kwargs):
diff --git a/django/contrib/postgres/fields/ranges.py b/django/contrib/postgres/fields/ranges.py
index 13ba606c79..5f9e13508e 100644
--- a/django/contrib/postgres/fields/ranges.py
+++ b/django/contrib/postgres/fields/ranges.py
@@ -43,7 +43,7 @@ class RangeField(models.Field):
         self.base_field.set_attributes_from_name(name)
 
     def value_to_string(self, obj):
-        value = self._get_val_from_obj(obj)
+        value = self.value_from_object(obj)
         if value is None:
             return None
         if value.isempty:
-- 
cgit v1.3