Simplified generation of result in Query.get_aggregation().

sir-sigurd · timgraham · commit 41640760dfb2 · 2017-08-15T09:59:31.000-04:00
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
@@ -461,16 +461,12 @@ def get_aggregation(self, using, added_aggregate_names):
         compiler = outer_query.get_compiler(using)
         result = compiler.execute_sql(SINGLE)
         if result is None:
-            result = [None for q in outer_query.annotation_select.items()]
+            result = [None] * len(outer_query.annotation_select)
 
         converters = compiler.get_converters(outer_query.annotation_select.values())
         result = next(compiler.apply_converters((result,), converters))
 
-        return {
-            alias: val
-            for (alias, annotation), val
-            in zip(outer_query.annotation_select.items(), result)
-        }
+        return dict(zip(outer_query.annotation_select, result))
 
     def get_count(self, using):
         """
