From d828d4e186b5433f637b86c4e44a3b68acab5cb8 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 4 Nov 2012 15:57:45 -0800 Subject: [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. --- django/forms/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django/forms') 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 -- cgit v1.3