summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2012-11-04 15:57:45 -0800
committerAlex Gaynor <alex.gaynor@rd.io>2012-11-04 15:58:37 -0800
commitd828d4e186b5433f637b86c4e44a3b68acab5cb8 (patch)
treeb387258f9431d286e5394b6977b338b9f42370b2 /django/forms
parentf7552a2889568b16fe76a286559c2eba4e38f508 (diff)
[1.5.x] Merge pull request #495 from aisipos/ticket_18949
Fixed #18949 -- Improve performance of model_to_dict with many-to-many Backport of 4d766b3c9aca36cbe7dc71df0cc93fb6f9deea60.
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/models.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/forms/models.py b/django/forms/models.py
index 11fe0c09ea..e9b71ccf26 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -126,7 +126,7 @@ def model_to_dict(instance, fields=None, exclude=None):
data[f.name] = []
else:
# MultipleChoiceWidget needs a list of pks, not object instances.
- data[f.name] = [obj.pk for obj in f.value_from_object(instance)]
+ data[f.name] = list(f.value_from_object(instance).values_list('pk', flat=True))
else:
data[f.name] = f.value_from_object(instance)
return data