Ticket #8630: 8630_r9776.diff

django/contrib/comments/admin.py

@@ -1 +1 @@
-from django.contrib import admin
-from django.contrib.comments.models import Comment
-from django.utils.translation import ugettext_lazy as _
+from django.contrib.comments import get_model
-
-class CommentsAdmin(admin.ModelAdmin):
-    fieldsets = (
@@ -21 +22 @@
-    ordering = ('-submit_date',)
-    search_fields = ('comment', 'user__username', 'user_name', 'user_email', 'user_url', 'ip_address')
-
-
+
+

django/contrib/comments/__init__.py

@@ -2 +2 @@
-from django.core import urlresolvers
-from django.core.exceptions import ImproperlyConfigured
-
-# Attributes required in the top-level app for COMMENTS_APP
-REQUIRED_COMMENTS_APP_ATTRIBUTES = ["get_model", "get_form", "get_form_target"]
-
-def get_comment_app():
-    """
-    Get the comment app (i.e. "django.contrib.comments") as defined in the settings
@@ -22 +19 @@
-        raise ImproperlyConfigured("The COMMENTS_APP setting refers to "\
-                                   "a non-existing package.")
-
-    # Make sure some specific attributes exist inside that package.
-    for attribute in REQUIRED_COMMENTS_APP_ATTRIBUTES:
-        if not hasattr(package, attribute):
-            raise ImproperlyConfigured("The COMMENTS_APP package %r does not "\
-                                       "define the (required) %r function" % \
-                                            (package, attribute))
-
-    return package
-
-def get_comment_app_name():
@@ -39 +29 @@
-    return getattr(settings, 'COMMENTS_APP', 'django.contrib.comments')
-
-def get_model():
+    if get_comment_app_name() != __name__ and hasattr(get_comment_app(), "get_model"):
+        return get_comment_app().get_model()
-    from django.contrib.comments.models import Comment
-    return Comment
-
-def get_form():
+    if get_comment_app_name() != __name__ and hasattr(get_comment_app(), "get_form"):
+        return get_comment_app().get_form()
-    from django.contrib.comments.forms import CommentForm
-    return CommentForm
-
-def get_form_target():
+    if get_comment_app_name() != __name__ and hasattr(get_comment_app(), "get_form_target"):
+        return get_comment_app().get_form_target()
-    return urlresolvers.reverse("django.contrib.comments.views.comments.post_comment")
-
-def get_flag_url(comment):
@@ -55 +51 @@
-    """
-    if get_comment_app_name() != __name__ and hasattr(get_comment_app(), "get_flag_url"):
-        return get_comment_app().get_flag_url(comment)
-
-
+
-
-def get_delete_url(comment):
-    """
-    Get the URL for the "delete this comment" view.
-    """
-    if get_comment_app_name() != __name__ and hasattr(get_comment_app(), "get_delete_url"):
-
-
-
+
+
-
-def get_approve_url(comment):
-    """
@@ -73 +67 @@
-    """
-    if get_comment_app_name() != __name__ and hasattr(get_comment_app(), "get_approve_url"):
-        return get_comment_app().get_approve_url(comment)
-
-
+

tests/regressiontests/comment_tests/tests/app_api_tests.py

@@ -28 +28 @@
-        c = Comment(id=12345)
-        self.assertEqual(comments.get_approve_url(c), "/approve/12345/")
-
+
+class CustomCommentTest(CommentTestCase):
+    urls = 'regressiontests.comment_tests.urls'
+
+    def setUp(self):
+        self.old_comments_app   = getattr(settings, 'COMMENTS_APP', None)
+        settings.COMMENTS_APP   = 'regressiontests.comment_tests.custom_comments'
+        settings.INSTALLED_APPS = list(settings.INSTALLED_APPS) + [settings.COMMENTS_APP,]
+
+    def tearDown(self):
+        del settings.INSTALLED_APPS[-1]
+        settings.COMMENTS_APP = self.old_comments_app
+        if settings.COMMENTS_APP is None:
+            delattr(settings._target, 'COMMENTS_APP')
+
+    def testGetCommentApp(self):
+        from regressiontests.comment_tests import custom_comments
+        self.assertEqual(comments.get_comment_app(), custom_comments)
+
+    def testGetModel(self):
+        from regressiontests.comment_tests.custom_comments.models import CustomComment
+        self.assertEqual(comments.get_model(), CustomComment)
+
+    def testGetForm(self):
+        from regressiontests.comment_tests.custom_comments.forms import CustomCommentForm
+        self.assertEqual(comments.get_form(), CustomCommentForm)
+
+    def testGetFormTarget(self):
+        self.assertEqual(comments.get_form_target(), "/post/")
+
+    def testGetFlagURL(self):
+        c = Comment(id=12345)
+        self.assertEqual(comments.get_flag_url(c), "/flag/12345/")
+
+    def getGetDeleteURL(self):
+        c = Comment(id=12345)
+        self.assertEqual(comments.get_delete_url(c), "/delete/12345/")
+
+    def getGetApproveURL(self):
+        c = Comment(id=12345)
+        self.assertEqual(comments.get_approve_url(c), "/approve/12345/")

docs/ref/contrib/comments/index.txt

@@ -164 +164 @@
-considerations you'll need to make if you're using this aproach.
-
-.. templatetag:: comment_form_target
+.. _notes-on-the-comment-form:
-
-Getting the comment form target
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -212 +213 @@
-   settings
-   signals
-   upgrade
-
+

docs/ref/contrib/comments/settings.txt

@@ -29 +29 @@
-COMMENTS_APP
-------------
-
-
-
-
+
+
+
+