Merge branch 'linovia-master'

taggit/tests/tests.py

@@ -52,7 +52,11 @@ class BaseTaggingTest(object):
         return form_str
         return form_str
 
 
     def assert_form_renders(self, form, html):
     def assert_form_renders(self, form, html):
-        self.assertEqual(str(form), self._get_form_str(html))
+        try:
+            self.assertHTMLEqual(str(form), self._get_form_str(html))
+        except AttributeError:
+            self.assertEqual(str(form), self._get_form_str(html))
+
 
 
 class BaseTaggingTestCase(TestCase, BaseTaggingTest):
 class BaseTaggingTestCase(TestCase, BaseTaggingTest):
     pass
     pass

taggit/views.py

 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import get_object_or_404
 from django.shortcuts import get_object_or_404
-from django.views.generic.list_detail import object_list
+from django.views.generic.list import ListView
 
 
 from taggit.models import TaggedItem, Tag
 from taggit.models import TaggedItem, Tag
 
 
@@ -15,4 +15,5 @@ def tagged_object_list(request, slug, queryset, **kwargs):
     if "extra_context" not in kwargs:
     if "extra_context" not in kwargs:
         kwargs["extra_context"] = {}
         kwargs["extra_context"] = {}
     kwargs["extra_context"]["tag"] = tag
     kwargs["extra_context"]["tag"] = tag
-    return object_list(request, qs, **kwargs)
+    return ListView.as_view(request, qs, **kwargs)
+