mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-28 16:16:12 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #28907 -- Removed unnecessary if statements.

Browse Source
This commit is contained in:
Tim Graham
2017-12-07 17:12:00 -05:00
committed by GitHub
parent c6864a01b2
commit 02d9419fe3
3 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
django/db/models/query.py
View File

@@ -62,9 +62,8 @@ class ModelIterable(BaseIterable):
related_populators = get_related_populators(klass_info, select, db)
for row in compiler.results_iter(results):
obj = model_cls.from_db(db, init_list, row[model_fields_start:model_fields_end])
if related_populators:
for rel_populator in related_populators:
rel_populator.populate(row, obj)
for rel_populator in related_populators:
rel_populator.populate(row, obj)
if annotation_col_map:
for attr_name, col_pos in annotation_col_map.items():
setattr(obj, attr_name, row[col_pos])
@@ -1771,9 +1770,8 @@ class RelatedPopulator:
obj = None
else:
obj = self.model_cls.from_db(self.db, self.init_list, obj_data)
if self.related_populators:
for rel_iter in self.related_populators:
rel_iter.populate(row, obj)
for rel_iter in self.related_populators:
rel_iter.populate(row, obj)
self.local_setter(from_obj, obj)
if obj is not None:
self.remote_setter(obj, from_obj)