From c47f8a9d4d2db79b85562266150adcf4e44319e9 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 26 Sep 2016 18:47:07 -0400 Subject: [PATCH] Removed obsolete lines in DeferredAttribute.__get__(). Obsolete as of c21e86ab9e3e5ebd6d245d038cb0cb352cd84c3a. --- django/db/models/query_utils.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/django/db/models/query_utils.py b/django/db/models/query_utils.py index 111ba65f3c3..fa245fcf073 100644 --- a/django/db/models/query_utils.py +++ b/django/db/models/query_utils.py @@ -10,7 +10,6 @@ from __future__ import unicode_literals import inspect from collections import namedtuple -from django.core.exceptions import FieldDoesNotExist from django.db.models.constants import LOOKUP_SEP from django.utils import tree from django.utils.lru_cache import lru_cache @@ -108,19 +107,11 @@ class DeferredAttribute(object): """ if instance is None: return self - opts = instance._meta data = instance.__dict__ if data.get(self.field_name, self) is self: - # self.field_name is the attname of the field, but only() takes the - # actual name, so we need to translate it here. - try: - f = opts.get_field(self.field_name) - except FieldDoesNotExist: - f = [f for f in opts.fields if f.attname == self.field_name][0] - name = f.name # Let's see if the field is part of the parent chain. If so we # might be able to reuse the already loaded value. Refs #18343. - val = self._check_parent_chain(instance, name) + val = self._check_parent_chain(instance, self.field_name) if val is None: instance.refresh_from_db(fields=[self.field_name]) val = getattr(instance, self.field_name)