isbn/csv: volume names, list from slugs and other changes

[wolnelektury.git] / src / newtagging / views.py

diff --git a/src/newtagging/views.py b/src/newtagging/views.py
index 867686d..12e528a 100644 (file)
--- a/src/newtagging/views.py
+++ b/src/newtagging/views.py
@@ -7,8 +7,8 @@ from django.utils.translation import ugettext as _
 from django.views.generic import ListView
 
 
-def tagged_object_list(request, queryset_or_model=None, tag_model=None, tags=None,
-        related_tags=False, related_tag_counts=True, **kwargs):
+def tagged_object_list(request, queryset_or_model, tag_model, tags, related_tags=False,
+                       related_tag_counts=True, **kwargs):
     """
     A thin wrapper around
     ``django.views.generic.list_detail.object_list`` which creates a
@@ -25,24 +25,15 @@ def tagged_object_list(request, queryset_or_model=None, tag_model=None, tags=Non
     tag will have a ``count`` attribute indicating the number of items
     which have it in addition to the given tag.
     """
-    # Check attributes
-    if queryset_or_model is None:
-        raise AttributeError(_('tagged_object_list must be called with a queryset or a model.'))
-    if tag_model is None:
-        raise AttributeError(_('tagged_object_list must be called with a tag model.'))
-    if tags is None:
-        raise AttributeError(_('tagged_object_list must be called with a tag.'))
 
     tag_instances = tag_model.get_tag_list(tags)
     if tag_instances is None:
         raise Http404(_('No tags found matching "%s".') % tags)
     queryset = tag_model.intermediary_table_model.objects.get_by_model(queryset_or_model, tag_instances)
-    if not kwargs.has_key('extra_context'):
+    if 'extra_context' not in kwargs:
         kwargs['extra_context'] = {}
     kwargs['extra_context']['tags'] = tag_instances
     if related_tags:
         kwargs['extra_context']['related_tags'] = \
-            tag_model.objects.related_for_model(tag_instances, queryset_or_model,
-                                          counts=related_tag_counts)
+            tag_model.objects.related_for_model(tag_instances, queryset_or_model, counts=related_tag_counts)
     return ListView.as_view(queryset=queryset)(request, **kwargs)
-