summaryrefslogtreecommitdiff
path: root/django/db/models/query.py
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2009-12-19 14:50:41 +0000
committerLuke Plant <L.Plant.98@cantab.net>2009-12-19 14:50:41 +0000
commit7efd96844da89219b6fa5a9adfac4e5ff477b833 (patch)
tree048322b2f426b83cef6eb865fa1de4a1b6ee7734 /django/db/models/query.py
parent01acd99947b0723f5c9643aa4d438d553c82324c (diff)
Fixed #12251 - QuerySet.in_bulk() should accept set/frozenset
Thanks to emulbreh for patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/query.py')
-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 9cc7659c69..ab85bdc348 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -386,7 +386,7 @@ class QuerySet(object):
"""
assert self.query.can_filter(), \
"Cannot use 'limit' or 'offset' with in_bulk"
- assert isinstance(id_list, (tuple, list)), \
+ assert isinstance(id_list, (tuple, list, set, frozenset)), \
"in_bulk() must be provided with a list of IDs."
if not id_list:
return {}