mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-26 20:19:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed #30159 -- Removed unneeded use of OrderedDict.

Browse source 
Dicts preserve order since Python 3.6.
This commit is contained in:
Nick Pope 2019-02-05 11:22:08 +00:00 • committed by Tim Graham
parent 21bb71ef0d
commit 24b82cd201
31 changed files with 201 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

8
django/db/models/query.py
View file

@ -5,7 +5,7 @@ The main QuerySet implementation. This provides the public API for the ORM.
import copy
import operator
import warnings
from collections import OrderedDict, namedtuple
from collections import namedtuple
from functools import lru_cache
from itertools import chain
@ -725,7 +725,7 @@ class QuerySet:
query = self.query.chain(sql.UpdateQuery)
query.add_update_values(kwargs)
# Clear any annotations so that they won't be present in subqueries.
query._annotations = None
query.annotations = {}
with transaction.mark_for_rollback_on_error(using=self.db):
rows = query.get_compiler(self.db).execute_sql(CURSOR)
self._result_cache = None
@ -744,7 +744,7 @@ class QuerySet:
query = self.query.chain(sql.UpdateQuery)
query.add_update_fields(values)
# Clear any annotations so that they won't be present in subqueries.
query._annotations = None
query.annotations = {}
self._result_cache = None
return query.get_compiler(self.db).execute_sql(CURSOR)
_update.alters_data = True
@ -1014,7 +1014,7 @@ class QuerySet:
with extra data or aggregations.
"""
self._validate_values_are_expressions(args + tuple(kwargs.values()), method_name='annotate')
annotations = OrderedDict() # To preserve ordering of args
annotations = {}
for arg in args:
# The default_alias property may raise a TypeError.
try: