Ticket #16042: 16042.2.diff

django/contrib/comments/templatetags/comments.py

@@ -47 +47 @@
     def lookup_content_type(token, tagname):
         try:
             app, model = token.split('.')
-            return ContentType.objects.get(app_label=app, model=model)
+            return ContentType.objects.get_by_natural_key(app, model)
         except ValueError:
             raise template.TemplateSyntaxError("Third argument in %r must be in the format 'app.model'" % tagname)
         except ContentType.DoesNotExist:

tests/regressiontests/comment_tests/tests/templatetag_tests.py

@@ -1 +1 @@
 from django.contrib.comments.forms import CommentForm
 from django.contrib.comments.models import Comment
 from django.contrib.contenttypes.models import ContentType
-from django.template import Template, Context
+from django.template import Template, Context, RequestContext
 from regressiontests.comment_tests.models import Article, Author
 from regressiontests.comment_tests.tests import CommentTestCase
+from django.db import connection
+from django.conf import settings
+from django.test import RequestFactory
 
 class CommentTemplateTagTests(CommentTestCase):
 
@@ -100 +103 @@
     def testRenderCommentListFromObject(self):
         self.testRenderCommentList("{% render_comment_list for a %}")
 
+class CommentTemplateTagNumQueries(CommentTemplateTagTests):
+    def setUp(self):
+        super(CommentTemplateTagNumQueries, self).setUp()
+        settings.DEBUG = True
+
+    def tearDown(self):
+        settings.DEBUG = False
+        super(CommentTemplateTagNumQueries, self).tearDown()
+
+    def render(self, t, **c):
+        rf = RequestFactory()
+        request = rf.get("/")
+        ctx = RequestContext(request, c)
+        out = Template(t).render(ctx)
+        return ctx, out
+
+    def renderCommentList(self, tag=None):
+        connection.queries = []
+        t = "{% load comments %}" + (tag or "{% render_comment_list for comment_tests.article a.id %}")
+        ctx, out = self.render(t, a=Article.objects.get(pk=1))
+        return len(connection.queries)
+
+    def testNumberQueries(self):
+        self.createSomeComments()
+
+        num_queries = self.renderCommentList()
+        num_queries_2 = self.renderCommentList()
+        self.assertEquals(num_queries, 3)
+        self.assertEquals(num_queries, num_queries_2)
+        ContentType.objects.__class__._cache = {}
+        num_queries_3 = self.renderCommentList()
+        self.assertEquals(4, num_queries_3)