Commit 035b0fa6 authored by Thomas Stephenson's avatar Thomas Stephenson Committed by Tim Graham
Browse files

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.
parent 0ffa3943

django/contrib/gis/serializers/geojson.py

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ class Serializer(JSONSerializer): 


    def handle_field(self, obj, field):

        if field.name == self.geometry_field:

            self._geometry = field._get_val_from_obj(obj)

            self._geometry = field.value_from_object(obj)

        else:

            super(Serializer, self).handle_field(obj, field)

django/contrib/postgres/fields/array.py

+1 −1
Original line number Diff line number Diff line
@@ -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:

django/contrib/postgres/fields/hstore.py

+1 −2
Original line number Diff line number Diff line
@@ -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 = {

django/contrib/postgres/fields/jsonb.py

+1 −1
Original line number Diff line number Diff line
@@ -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):

django/contrib/postgres/fields/ranges.py

+1 −1
Original line number Diff line number Diff line
@@ -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: