From cb90d489da4247c1c7ced86a42a2d89488fec67c Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 19 Jan 2015 20:54:57 -0500 Subject: [PATCH] [1.8.x] Fixed a query failure on Python 3.5; refs #23763. The failure was introduced in Django by c7fd9b242d2d63406f1de6cc3204e35aaa025233 and the change in Python 3.5 is https://hg.python.org/cpython/rev/a3c345ba3563. Backport of be1357e70983d4ad029a1ecdd05292f8be917a80 from master --- django/db/models/sql/query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index c5e7eab28c4df..9693206b67aa8 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -402,7 +402,7 @@ def get_aggregation(self, using, added_aggregate_names): # Remove any aggregates marked for reduction from the subquery # and move them to the outer AggregateQuery. col_cnt = 0 - for alias, expression in inner_query.annotation_select.items(): + for alias, expression in list(inner_query.annotation_select.items()): if expression.is_summary: expression, col_cnt = inner_query.rewrite_cols(expression, col_cnt) outer_query.annotations[alias] = expression.relabeled_clone(relabels)