Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #16472 -- Removed stale code in the query code. Thanks, fva@cht…

…d.org.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 50ed810c1ffcda2432cf1417d739a98c78f572b1 1 parent 643239e
@jezdez jezdez authored
Showing with 0 additions and 5 deletions.
  1. +0 −5 django/db/models/query.py
View
5 django/db/models/query.py
@@ -226,7 +226,6 @@ def iterator(self):
only_load = self.query.get_loaded_field_names()
if not fill_cache:
fields = self.model._meta.fields
- pk_idx = self.model._meta.pk_index()
load_fields = []
# If only/defer clauses have been specified,
@@ -235,9 +234,6 @@ def iterator(self):
for field, model in self.model._meta.get_fields_with_model():
if model is None:
model = self.model
- if field == self.model._meta.pk:
- # Record the index of the primary key when it is found
- pk_idx = len(load_fields)
try:
if field.name in only_load[model]:
# Add a field that has been explicitly included
@@ -276,7 +272,6 @@ def iterator(self):
else:
if skip:
row_data = row[index_start:aggregate_start]
- pk_val = row_data[pk_idx]
obj = model_cls(**dict(zip(init_list, row_data)))
else:
# Omit aggregates in object creation.
Please sign in to comment.
Something went wrong with that request. Please try again.