Merge branch 'django-1.5'

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

diff --git a/apps/newtagging/views.py b/apps/newtagging/views.py
index 150a084..dee8e18 100644 (file)
--- a/apps/newtagging/views.py
+++ b/apps/newtagging/views.py
@@ -1,9 +1,10 @@
+# -*- coding: utf-8 -*-
 """
 Tagging related views.
 """
 from django.http import Http404
 from django.utils.translation import ugettext as _
-from django.views.generic.list_detail import object_list
+from django.views.generic import ListView
 
 
 def tagged_object_list(request, queryset_or_model=None, tag_model=None, tags=None,
@@ -43,5 +44,5 @@ def tagged_object_list(request, queryset_or_model=None, tag_model=None, tags=Non
         kwargs['extra_context']['related_tags'] = \
             tag_model.objects.related_for_model(tag_instances, queryset_or_model,
                                           counts=related_tag_counts)
-    return object_list(request, queryset, **kwargs)
+    return ListView.as_view(queryset=queryset)(request, **kwargs)