diff options
author | Jonas Genannt <genannt@debian.org> | 2015-11-15 22:26:10 +0100 |
---|---|---|
committer | Jonas Genannt <genannt@debian.org> | 2015-11-15 22:26:10 +0100 |
commit | da6a2bd205506257eaa6785c00981c88146d6c9f (patch) | |
tree | 6636c5e5a0186d9bf42c0df12bbb2180480ace7b /tagging/generic.py | |
parent | 24cd0a91184be6fa20168f9b132b1ab3f5911949 (diff) | |
parent | d65aa3c3c146b12548a54c894060bce9a8715ad2 (diff) | |
download | python-django-tagging-da6a2bd205506257eaa6785c00981c88146d6c9f.tar python-django-tagging-da6a2bd205506257eaa6785c00981c88146d6c9f.tar.gz |
Merge tag 'upstream/0.4'
Upstream version 0.4
# gpg: Signature made Sun 15 Nov 2015 10:26:06 PM CET using RSA key ID 016CFFD0
# gpg: Good signature from "Jonas Genannt <jonas@brachium-system.net>"
# gpg: aka "Jonas Genannt <jonas.genannt@capi2name.de>"
# gpg: aka "Jonas Genannt <genannt@debian.org>"
* tag 'upstream/0.4':
Imported Upstream version 0.4
Diffstat (limited to 'tagging/generic.py')
-rw-r--r-- | tagging/generic.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tagging/generic.py b/tagging/generic.py index 75d1b8e..770e928 100644 --- a/tagging/generic.py +++ b/tagging/generic.py @@ -1,5 +1,9 @@ +""" +Generic components for tagging. +""" from django.contrib.contenttypes.models import ContentType + def fetch_content_objects(tagged_items, select_related_for=None): """ Retrieves ``ContentType`` and content objects for the given list of @@ -15,7 +19,8 @@ def fetch_content_objects(tagged_items, select_related_for=None): ``ContentType``) for which ``select_related`` should be used when retrieving model instances. """ - if select_related_for is None: select_related_for = [] + if select_related_for is None: + select_related_for = [] # Group content object pks by their content type pks objects = {} @@ -27,9 +32,11 @@ def fetch_content_objects(tagged_items, select_related_for=None): for content_type_pk, object_pks in objects.iteritems(): model = content_types[content_type_pk].model_class() if content_types[content_type_pk].model in select_related_for: - objects[content_type_pk] = model._default_manager.select_related().in_bulk(object_pks) + objects[content_type_pk] = model._default_manager.select_related( + ).in_bulk(object_pks) else: - objects[content_type_pk] = model._default_manager.in_bulk(object_pks) + objects[content_type_pk] = model._default_manager.in_bulk( + object_pks) # Set content types and content objects in the appropriate cache # attributes, so accessing the 'content_type' and 'object' |