summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2014-03-20 22:21:14 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-03-20 22:22:00 +0100
commit222262ca2354abadf259f4186a0b43f583ed1bd1 (patch)
treea850c636127cbc10de3ca76599e754ebd52a898e
parent0cf158cf9ac6f4d03faf8b72a71bf1d06ad8503e (diff)
Fixed #22163 -- Stopped ignoring unhandled kwargs in select_for_update.
-rw-r--r--django/db/models/query.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 15339ccbdb..f69ac27b65 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -721,13 +721,11 @@ class QuerySet(object):
else:
return self._filter_or_exclude(None, **filter_obj)
- def select_for_update(self, **kwargs):
+ def select_for_update(self, nowait=False):
"""
Returns a new QuerySet instance that will select objects with a
FOR UPDATE lock.
"""
- # Default to false for nowait
- nowait = kwargs.pop('nowait', False)
obj = self._clone()
obj._for_write = True
obj.query.select_for_update = True