summaryrefslogtreecommitdiff
path: root/django/contrib/postgres/fields/array.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-07-06 13:18:05 -0400
committerTim Graham <timograham@gmail.com>2017-07-20 16:30:08 -0400
commit487362fa8f23d41de4db58e7408e66eb36399af0 (patch)
tree25897a03c885d44a15860f59c121f0b6fab3e4a8 /django/contrib/postgres/fields/array.py
parent8d5095d8a33824e02c95ee44d6e5acdb4b39e7ed (diff)
downloaddjango-487362fa8f23d41de4db58e7408e66eb36399af0.tar.gz
Fixed #28370 -- Deprecated the context arg of Field.from_db_value() and Expression.convert_value().
Unused since a0d166306fbdc41f49e6fadf4ec84b17eb147daa.
Diffstat (limited to 'django/contrib/postgres/fields/array.py')
-rw-r--r--django/contrib/postgres/fields/array.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/django/contrib/postgres/fields/array.py b/django/contrib/postgres/fields/array.py
index 18050e9a56..d418e1dc1a 100644
--- a/django/contrib/postgres/fields/array.py
+++ b/django/contrib/postgres/fields/array.py
@@ -6,6 +6,7 @@ from django.contrib.postgres.validators import ArrayMaxLengthValidator
from django.core import checks, exceptions
from django.db.models import Field, IntegerField, Transform
from django.db.models.lookups import Exact, In
+from django.utils.inspect import func_supports_parameter
from django.utils.translation import gettext_lazy as _
from ..utils import prefix_validation_error
@@ -103,11 +104,13 @@ class ArrayField(Field):
value = [self.base_field.to_python(val) for val in vals]
return value
- def _from_db_value(self, value, expression, connection, context):
+ def _from_db_value(self, value, expression, connection):
if value is None:
return value
return [
- self.base_field.from_db_value(item, expression, connection, context)
+ self.base_field.from_db_value(item, expression, connection, {})
+ if func_supports_parameter(self.base_field.from_db_value, 'context') # RemovedInDjango30Warning
+ else self.base_field.from_db_value(item, expression, connection)
for item in value
]