summaryrefslogtreecommitdiff
path: root/django/db
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2012-03-12 22:33:18 +0000
committerKaren Tracey <kmtracey@gmail.com>2012-03-12 22:33:18 +0000
commit9d98b9eb4bee1c9d69694f37dc618c36ecfecb8d (patch)
treeb63bb246220d326288642080cb90c6222bf0c507 /django/db
parentdb512b4d8c8c8b6e8a0dbc217617b4de97d84b69 (diff)
Fix #17876: Corrected an exception (regression) raised where select_realted and only is used on a proxy model. Thanks milosu and charettes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db')
-rw-r--r--django/db/models/query.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 08fda78332..44acadf037 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -1266,7 +1266,7 @@ def get_klass_info(klass, max_depth=0, cur_depth=0, requested=None,
return None
if only_load:
- load_fields = only_load.get(klass)
+ load_fields = only_load.get(klass) or set()
# When we create the object, we will also be creating populating
# all the parent classes, so traverse the parent classes looking
# for fields that must be included on load.