summaryrefslogtreecommitdiff
path: root/django/db/models/sql/query.py
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-10-08 08:37:35 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-10-08 08:37:35 +0000
commit268ef594ace36e82043b2f9b6eaa18531cd24b2f (patch)
tree50dc854f05eba24df4c61a14065ff28c55780dd3 /django/db/models/sql/query.py
parentce770aaecd1f3677c501ab41e5adbed8db44f109 (diff)
Applying a limit to a queryset that already had an upper limit of 0 wasn't
working properly. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9201 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql/query.py')
-rw-r--r--django/db/models/sql/query.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index bf3b63f100..9ac0d0c960 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -1491,12 +1491,12 @@ class Query(object):
clamped to any existing high value.
"""
if high is not None:
- if self.high_mark:
+ if self.high_mark is not None:
self.high_mark = min(self.high_mark, self.low_mark + high)
else:
self.high_mark = self.low_mark + high
if low is not None:
- if self.high_mark:
+ if self.high_mark is not None:
self.low_mark = min(self.high_mark, self.low_mark + low)
else:
self.low_mark = self.low_mark + low