From 5366beeb703c846da5316bbfd40e67bbf5fcb2e2 Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Fri, 3 Feb 2006 13:03:51 +0000 Subject: [PATCH] magic-removal: Fixed bug in parse_lookup introduced in 2150, and tidied up a bit git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2236 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/query.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/django/db/models/query.py b/django/db/models/query.py index 6aee7e52be..38dbe7e775 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -574,9 +574,7 @@ def parse_lookup(kwarg_items, opts): tables, joins, where, params = [], SortedDict(), [], [] for kwarg, value in kwarg_items: - if value is None: - pass - else: + if value is not None: path = kwarg.split(LOOKUP_SEPARATOR) # Extract the last elements of the kwarg. # The very-last is the clause (equals, like, etc). @@ -599,11 +597,11 @@ def parse_lookup(kwarg_items, opts): if len(path) < 1: raise TypeError, "Cannot parse keyword query %r" % kwarg - tables2, joins2, where2, params2 = lookup_inner(path, clause, value, opts, opts.db_table, None) - tables.extend(tables2) - joins.update(joins2) - where.extend(where2) - params.extend(params2) + tables2, joins2, where2, params2 = lookup_inner(path, clause, value, opts, opts.db_table, None) + tables.extend(tables2) + joins.update(joins2) + where.extend(where2) + params.extend(params2) return tables, joins, where, params class FieldFound(Exception):