Ticket #8630: 8630_r8782_alternative.diff

django/contrib/comments/templatetags/comments.py

@@ -2 +2 @@
 from django.template.loader import render_to_string
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
-from django.contrib import comments
+from django.contrib.comments import get_comment_app
 from django.utils.encoding import smart_unicode
 
 register = template.Library()
@@ -59 +59 @@
     def __init__(self, ctype=None, object_pk_expr=None, object_expr=None, as_varname=None, comment=None):
         if ctype is None and object_expr is None:
             raise template.TemplateSyntaxError("Comment nodes must be given either a literal object or a ctype and object pk.")
-        self.comment_model = comments.get_model()
+        self.comment_model = get_comment_app().get_model()
         self.as_varname = as_varname
         self.ctype = ctype
         self.object_pk_expr = object_pk_expr
@@ -117 +117 @@
     def get_form(self, context):
         ctype, object_pk = self.get_target_ctype_pk(context)
         if object_pk:
-            return comments.get_form()(ctype.get_object_for_this_type(pk=object_pk))
+            return get_comment_app().get_form()(ctype.get_object_for_this_type(pk=object_pk))
         else:
             return None
 
@@ -243 +243 @@
 
         <form action="{% comment_form_target %}" method="POST">
     """
-    return comments.get_form_target()
+    return get_comment_app().get_form_target()
 
 register.tag(get_comment_count)
 register.tag(get_comment_list)