Stubbed out a setup.py and a test runner.

+*.pyc

+Copyright (c) 2013, Django Software Foundation and individual contributors
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of django-contrib-comments nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+FIXME

-import warnings
 from django.conf import settings
 from django.conf import settings
 from django.core import urlresolvers
 from django.core import urlresolvers
 from django.core.exceptions import ImproperlyConfigured
 from django.core.exceptions import ImproperlyConfigured
-from django.contrib.comments.models import Comment
-from django.contrib.comments.forms import CommentForm
 from django.utils.importlib import import_module
 from django.utils.importlib import import_module
 
 
-warnings.warn("django.contrib.comments is deprecated and will be removed before Django 1.8.", DeprecationWarning)
+from django_comments.models import Comment
+from django_comments.forms import CommentForm
 
 
-DEFAULT_COMMENTS_APP = 'django.contrib.comments'
+DEFAULT_COMMENTS_APP = 'django_comments'
 
 
 def get_comment_app():
 def get_comment_app():
     """
     """
-    Get the comment app (i.e. "django.contrib.comments") as defined in the settings
+    Get the comment app (i.e. "django_comments") as defined in the settings
     """
     """
     # Make sure the app's in INSTALLED_APPS
     # Make sure the app's in INSTALLED_APPS
     comments_app = get_comment_app_name()
     comments_app = get_comment_app_name()
@@ -61,7 +59,7 @@ def get_form_target():
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_form_target"):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_form_target"):
         return get_comment_app().get_form_target()
         return get_comment_app().get_form_target()
     else:
     else:
-        return urlresolvers.reverse("django.contrib.comments.views.comments.post_comment")
+        return urlresolvers.reverse("django_comments.views.comments.post_comment")
 
 
 def get_flag_url(comment):
 def get_flag_url(comment):
     """
     """
@@ -70,7 +68,7 @@ def get_flag_url(comment):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_flag_url"):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_flag_url"):
         return get_comment_app().get_flag_url(comment)
         return get_comment_app().get_flag_url(comment)
     else:
     else:
-        return urlresolvers.reverse("django.contrib.comments.views.moderation.flag",
+        return urlresolvers.reverse("django_comments.views.moderation.flag",
                                     args=(comment.id,))
                                     args=(comment.id,))
 
 
 def get_delete_url(comment):
 def get_delete_url(comment):
@@ -80,7 +78,7 @@ def get_delete_url(comment):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_delete_url"):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_delete_url"):
         return get_comment_app().get_delete_url(comment)
         return get_comment_app().get_delete_url(comment)
     else:
     else:
-        return urlresolvers.reverse("django.contrib.comments.views.moderation.delete",
+        return urlresolvers.reverse("django_comments.views.moderation.delete",
                                     args=(comment.id,))
                                     args=(comment.id,))
 
 
 def get_approve_url(comment):
 def get_approve_url(comment):
@@ -90,5 +88,5 @@ def get_approve_url(comment):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_approve_url"):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_approve_url"):
         return get_comment_app().get_approve_url(comment)
         return get_comment_app().get_approve_url(comment)
     else:
     else:
-        return urlresolvers.reverse("django.contrib.comments.views.moderation.approve",
+        return urlresolvers.reverse("django_comments.views.moderation.approve",
                                     args=(comment.id,))
                                     args=(comment.id,))

@@ -2,11 +2,11 @@ from __future__ import unicode_literals
 
 
 from django.contrib import admin
 from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.contrib.auth import get_user_model
-from django.contrib.comments.models import Comment
 from django.utils.translation import ugettext_lazy as _, ungettext, ungettext_lazy
 from django.utils.translation import ugettext_lazy as _, ungettext, ungettext_lazy
-from django.contrib.comments import get_model
 from django.contrib.comments.views.moderation import perform_flag, perform_approve, perform_delete
 from django.contrib.comments.views.moderation import perform_flag, perform_approve, perform_delete
 
 
+from django_comments import get_model
+from django_comments.models import Comment
 
 
 class UsernameSearch(object):
 class UsernameSearch(object):
     """The User object may not be auth.User, so we need to provide
     """The User object may not be auth.User, so we need to provide

 from django.contrib.syndication.views import Feed
 from django.contrib.syndication.views import Feed
 from django.contrib.sites.models import get_current_site
 from django.contrib.sites.models import get_current_site
-from django.contrib import comments
 from django.utils.translation import ugettext as _
 from django.utils.translation import ugettext as _
 
 
+import django_comments
+
 class LatestCommentFeed(Feed):
 class LatestCommentFeed(Feed):
     """Feed of latest comments on the current site."""
     """Feed of latest comments on the current site."""
 
 
@@ -20,7 +21,7 @@ class LatestCommentFeed(Feed):
         return _("Latest comments on %(site_name)s") % dict(site_name=self.site.name)
         return _("Latest comments on %(site_name)s") % dict(site_name=self.site.name)
 
 
     def items(self):
     def items(self):
-        qs = comments.get_model().objects.filter(
+        qs = django_comments.get_model().objects.filter(
             site__pk = self.site.pk,
             site__pk = self.site.pk,
             is_public = True,
             is_public = True,
             is_removed = False,
             is_removed = False,

@@ -3,13 +3,14 @@ from django import forms
 from django.forms.util import ErrorDict
 from django.forms.util import ErrorDict
 from django.conf import settings
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.comments.models import Comment
 from django.utils.crypto import salted_hmac, constant_time_compare
 from django.utils.crypto import salted_hmac, constant_time_compare
 from django.utils.encoding import force_text
 from django.utils.encoding import force_text
 from django.utils.text import get_text_list
 from django.utils.text import get_text_list
 from django.utils import timezone
 from django.utils import timezone
 from django.utils.translation import ungettext, ugettext, ugettext_lazy as _
 from django.utils.translation import ungettext, ugettext, ugettext_lazy as _
 
 
+from django_comments.models import Comment
+
 COMMENT_MAX_LENGTH = getattr(settings,'COMMENT_MAX_LENGTH', 3000)
 COMMENT_MAX_LENGTH = getattr(settings,'COMMENT_MAX_LENGTH', 3000)
 
 
 class CommentSecurityForm(forms.Form):
 class CommentSecurityForm(forms.Form):

 from django.conf import settings
 from django.conf import settings
-from django.contrib.comments.managers import CommentManager
 from django.contrib.contenttypes import generic
 from django.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
 from django.contrib.sites.models import Site
@@ -9,6 +8,8 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone
 from django.utils import timezone
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.encoding import python_2_unicode_compatible
 
 
+from django_comments.managers import CommentManager
+
 COMMENT_MAX_LENGTH = getattr(settings, 'COMMENT_MAX_LENGTH', 3000)
 COMMENT_MAX_LENGTH = getattr(settings, 'COMMENT_MAX_LENGTH', 3000)
 
 
 
 

@@ -29,7 +29,7 @@ a Weblog::
 Then we create a ``CommentModerator`` subclass specifying some
 Then we create a ``CommentModerator`` subclass specifying some
 moderation options::
 moderation options::
 
 
-    from django.contrib.comments.moderation import CommentModerator, moderator
+    from django_comments.moderation import CommentModerator, moderator
 
 
     class EntryModerator(CommentModerator):
     class EntryModerator(CommentModerator):
         email_notification = True
         email_notification = True
@@ -58,13 +58,14 @@ import datetime
 
 
 from django.conf import settings
 from django.conf import settings
 from django.core.mail import send_mail
 from django.core.mail import send_mail
-from django.contrib.comments import signals
 from django.db.models.base import ModelBase
 from django.db.models.base import ModelBase
 from django.template import Context, loader
 from django.template import Context, loader
-from django.contrib import comments
 from django.contrib.sites.models import get_current_site
 from django.contrib.sites.models import get_current_site
 from django.utils import timezone
 from django.utils import timezone
 
 
+import django_comments
+from django_comments import signals
+
 class AlreadyModerated(Exception):
 class AlreadyModerated(Exception):
     """
     """
     Raised when a model which is already registered for moderation is
     Raised when a model which is already registered for moderation is
@@ -286,8 +287,8 @@ class Moderator(object):
         from the comment models.
         from the comment models.
 
 
         """
         """
-        signals.comment_will_be_posted.connect(self.pre_save_moderation, sender=comments.get_model())
-        signals.comment_was_posted.connect(self.post_save_moderation, sender=comments.get_model())
+        signals.comment_will_be_posted.connect(self.pre_save_moderation, sender=django_comments.get_model())
+        signals.comment_was_posted.connect(self.post_save_moderation, sender=django_comments.get_model())
 
 
     def register(self, model_or_iterable, moderation_class):
     def register(self, model_or_iterable, moderation_class):
         """
         """

@@ -2,11 +2,12 @@ from django import template
 from django.template.loader import render_to_string
 from django.template.loader import render_to_string
 from django.conf import settings
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.models import ContentType
-from django.contrib import comments
 from django.utils import six
 from django.utils import six
 from django.utils.deprecation import RenameMethodsBase
 from django.utils.deprecation import RenameMethodsBase
 from django.utils.encoding import smart_text
 from django.utils.encoding import smart_text
 
 
+import django_comments
+
 register = template.Library()
 register = template.Library()
 
 
 
 
@@ -65,7 +66,7 @@ class BaseCommentNode(six.with_metaclass(RenameBaseCommentNodeMethods, template.
     def __init__(self, ctype=None, object_pk_expr=None, object_expr=None, as_varname=None, comment=None):
     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:
         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.")
             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 = django_comments.get_model()
         self.as_varname = as_varname
         self.as_varname = as_varname
         self.ctype = ctype
         self.ctype = ctype
         self.object_pk_expr = object_pk_expr
         self.object_pk_expr = object_pk_expr
@@ -130,7 +131,7 @@ class CommentFormNode(BaseCommentNode):
     def get_form(self, context):
     def get_form(self, context):
         obj = self.get_object(context)
         obj = self.get_object(context)
         if obj:
         if obj:
-            return comments.get_form()(obj)
+            return django_comments.get_form()(obj)
         else:
         else:
             return None
             return None
 
 
@@ -323,7 +324,7 @@ def comment_form_target():
 
 
         <form action="{% comment_form_target %}" method="post">
         <form action="{% comment_form_target %}" method="post">
     """
     """
-    return comments.get_form_target()
+    return django_comments.get_form_target()
 
 
 @register.simple_tag
 @register.simple_tag
 def get_comment_permalink(comment, anchor_pattern=None):
 def get_comment_permalink(comment, anchor_pattern=None):

 from django.conf.urls import patterns, url
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns('django.contrib.comments.views',
+urlpatterns = patterns('django_comments.views',
     url(r'^post/$',          'comments.post_comment',       name='comments-post-comment'),
     url(r'^post/$',          'comments.post_comment',       name='comments-post-comment'),
     url(r'^posted/$',        'comments.comment_done',       name='comments-comment-done'),
     url(r'^posted/$',        'comments.comment_done',       name='comments-comment-done'),
     url(r'^flag/(\d+)/$',    'moderation.flag',             name='comments-flag'),
     url(r'^flag/(\d+)/$',    'moderation.flag',             name='comments-flag'),

@@ -2,9 +2,6 @@ from __future__ import absolute_import
 
 
 from django import http
 from django import http
 from django.conf import settings
 from django.conf import settings
-from django.contrib import comments
-from django.contrib.comments import signals
-from django.contrib.comments.views.utils import next_redirect, confirmation_view
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import models
 from django.db import models
 from django.shortcuts import render_to_response
 from django.shortcuts import render_to_response
@@ -14,6 +11,9 @@ from django.utils.html import escape
 from django.views.decorators.csrf import csrf_protect
 from django.views.decorators.csrf import csrf_protect
 from django.views.decorators.http import require_POST
 from django.views.decorators.http import require_POST
 
 
+import django_comments
+from django_comments import signals
+from django_comments.views.utils import next_redirect, confirmation_view
 
 
 class CommentPostBadRequest(http.HttpResponseBadRequest):
 class CommentPostBadRequest(http.HttpResponseBadRequest):
     """
     """
@@ -72,7 +72,7 @@ def post_comment(request, next=None, using=None):
     preview = "preview" in data
     preview = "preview" in data
 
 
     # Construct the comment form
     # Construct the comment form
-    form = comments.get_form()(target, data=data)
+    form = django_comments.get_form()(target, data=data)
 
 
     # Check security information
     # Check security information
     if form.security_errors():
     if form.security_errors():

@@ -2,13 +2,13 @@ from __future__ import absolute_import
 
 
 from django import template
 from django import template
 from django.conf import settings
 from django.conf import settings
-from django.contrib import comments
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.auth.decorators import login_required, permission_required
-from django.contrib.comments import signals
-from django.contrib.comments.views.utils import next_redirect, confirmation_view
 from django.shortcuts import get_object_or_404, render_to_response
 from django.shortcuts import get_object_or_404, render_to_response
 from django.views.decorators.csrf import csrf_protect
 from django.views.decorators.csrf import csrf_protect
 
 
+import django_comments
+from django_comments import signals
+from django_comments.views.utils import next_redirect, confirmation_view
 
 
 @csrf_protect
 @csrf_protect
 @login_required
 @login_required
@@ -21,7 +21,7 @@ def flag(request, comment_id, next=None):
         comment
         comment
             the flagged `comments.comment` object
             the flagged `comments.comment` object
     """
     """
-    comment = get_object_or_404(comments.get_model(), pk=comment_id, site__pk=settings.SITE_ID)
+    comment = get_object_or_404(django_comments.get_model(), pk=comment_id, site__pk=settings.SITE_ID)
 
 
     # Flag on POST
     # Flag on POST
     if request.method == 'POST':
     if request.method == 'POST':
@@ -48,7 +48,7 @@ def delete(request, comment_id, next=None):
         comment
         comment
             the flagged `comments.comment` object
             the flagged `comments.comment` object
     """
     """
-    comment = get_object_or_404(comments.get_model(), pk=comment_id, site__pk=settings.SITE_ID)
+    comment = get_object_or_404(django_comments.get_model(), pk=comment_id, site__pk=settings.SITE_ID)
 
 
     # Delete on POST
     # Delete on POST
     if request.method == 'POST':
     if request.method == 'POST':
@@ -76,7 +76,7 @@ def approve(request, comment_id, next=None):
         comment
         comment
             the `comments.comment` object for approval
             the `comments.comment` object for approval
     """
     """
-    comment = get_object_or_404(comments.get_model(), pk=comment_id, site__pk=settings.SITE_ID)
+    comment = get_object_or_404(django_comments.get_model(), pk=comment_id, site__pk=settings.SITE_ID)
 
 
     # Delete on POST
     # Delete on POST
     if request.method == 'POST':
     if request.method == 'POST':
@@ -100,10 +100,10 @@ def perform_flag(request, comment):
     """
     """
     Actually perform the flagging of a comment from a request.
     Actually perform the flagging of a comment from a request.
     """
     """
-    flag, created = comments.models.CommentFlag.objects.get_or_create(
+    flag, created = django_comments.models.CommentFlag.objects.get_or_create(
         comment = comment,
         comment = comment,
         user    = request.user,
         user    = request.user,
-        flag    = comments.models.CommentFlag.SUGGEST_REMOVAL
+        flag    = django_comments.models.CommentFlag.SUGGEST_REMOVAL
     )
     )
     signals.comment_was_flagged.send(
     signals.comment_was_flagged.send(
         sender  = comment.__class__,
         sender  = comment.__class__,
@@ -114,10 +114,10 @@ def perform_flag(request, comment):
     )
     )
 
 
 def perform_delete(request, comment):
 def perform_delete(request, comment):
-    flag, created = comments.models.CommentFlag.objects.get_or_create(
+    flag, created = django_comments.models.CommentFlag.objects.get_or_create(
         comment = comment,
         comment = comment,
         user    = request.user,
         user    = request.user,
-        flag    = comments.models.CommentFlag.MODERATOR_DELETION
+        flag    = django_comments.models.CommentFlag.MODERATOR_DELETION
     )
     )
     comment.is_removed = True
     comment.is_removed = True
     comment.save()
     comment.save()
@@ -131,10 +131,10 @@ def perform_delete(request, comment):
 
 
 
 
 def perform_approve(request, comment):
 def perform_approve(request, comment):
-    flag, created = comments.models.CommentFlag.objects.get_or_create(
+    flag, created = django_comments.models.CommentFlag.objects.get_or_create(
         comment = comment,
         comment = comment,
         user    = request.user,
         user    = request.user,
-        flag    = comments.models.CommentFlag.MODERATOR_APPROVAL,
+        flag    = django_comments.models.CommentFlag.MODERATOR_APPROVAL,
     )
     )
 
 
     comment.is_removed = False
     comment.is_removed = False

@@ -12,9 +12,10 @@ from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response, resolve_url
 from django.shortcuts import render_to_response, resolve_url
 from django.template import RequestContext
 from django.template import RequestContext
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.exceptions import ObjectDoesNotExist
-from django.contrib import comments
 from django.utils.http import is_safe_url
 from django.utils.http import is_safe_url
 
 
+import django_comments
+
 def next_redirect(request, fallback, **get_kwargs):
 def next_redirect(request, fallback, **get_kwargs):
     """
     """
     Handle the "where should I go next?" part of comment views.
     Handle the "where should I go next?" part of comment views.
@@ -50,7 +51,7 @@ def confirmation_view(template, doc="Display a confirmation view."):
         comment = None
         comment = None
         if 'c' in request.GET:
         if 'c' in request.GET:
             try:
             try:
-                comment = comments.get_model().objects.get(pk=request.GET['c'])
+                comment = django_comments.get_model().objects.get(pk=request.GET['c'])
             except (ObjectDoesNotExist, ValueError):
             except (ObjectDoesNotExist, ValueError):
                 pass
                 pass
         return render_to_response(template,
         return render_to_response(template,

+Metadata-Version: 1.1
+Name: django-contrib.comments
+Version: 1.5
+Summary: The code formally known as django.contrib.comments.
+Home-page: http://github.com/django/django-contrib-comments
+Author: Django Software Foundation
+Author-email: jacob@jacobian.org
+License: BSD
+Description: UNKNOWN
+Platform: any
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Framework :: Django
+Classifier: Intended Audience :: Developers
+Classifier: Natural Language :: English
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.2
+Classifier: Programming Language :: Python :: 3.3

+README.txt
+setup.py
+django_comments/__init__.py
+django_comments/admin.py
+django_comments/feeds.py
+django_comments/forms.py
+django_comments/managers.py
+django_comments/models.py
+django_comments/moderation.py
+django_comments/signals.py
+django_comments/urls.py
+django_comments/templatetags/__init__.py
+django_comments/templatetags/comments.py
+django_comments/views/__init__.py
+django_comments/views/comments.py
+django_comments/views/moderation.py
+django_comments/views/utils.py
+django_contrib.comments.egg-info/PKG-INFO
+django_contrib.comments.egg-info/SOURCES.txt
+django_contrib.comments.egg-info/dependency_links.txt
+django_contrib.comments.egg-info/top_level.txt
+tests/custom_comments/__init__.py
+tests/custom_comments/forms.py
+tests/custom_comments/models.py
+tests/custom_comments/views.py

+

+tests
+django_comments

@@ -2,19 +2,7 @@
 Customizing the comments framework
 Customizing the comments framework
 ==================================
 ==================================
 
 
-.. currentmodule:: django.contrib.comments
-
-.. warning::
-
-    Django's comment framework has been deprecated and is no longer supported.
-    Most users will be better served with a custom solution, or a hosted
-    product like Disqus__.
-
-    The code formerly known as ``django.contrib.comments`` is `still available
-    in an external repository`__.
-
-    __ https://disqus.com/
-    __ https://github.com/django/django-contrib-comments
+.. currentmodule:: django_comments
 
 
 If the built-in comment framework doesn't quite fit your needs, you can extend
 If the built-in comment framework doesn't quite fit your needs, you can extend
 the comment app's behavior to add custom data and logic. The comments framework
 the comment app's behavior to add custom data and logic. The comments framework
@@ -73,15 +61,15 @@ the ``my_comment_app`` directory::
 In the ``models.py`` we'll define a ``CommentWithTitle`` model::
 In the ``models.py`` we'll define a ``CommentWithTitle`` model::
 
 
     from django.db import models
     from django.db import models
-    from django.contrib.comments.models import Comment
+    from django_comments.models import Comment
 
 
     class CommentWithTitle(Comment):
     class CommentWithTitle(Comment):
         title = models.CharField(max_length=300)
         title = models.CharField(max_length=300)
 
 
 Most custom comment models will subclass the
 Most custom comment models will subclass the
-:class:`~django.contrib.comments.models.Comment` model. However,
+:class:`~django_comments.models.Comment` model. However,
 if you want to substantially remove or change the fields available in the
 if you want to substantially remove or change the fields available in the
-:class:`~django.contrib.comments.models.Comment` model, but don't want to
+:class:`~django_comments.models.Comment` model, but don't want to
 rewrite the templates, you could try subclassing from
 rewrite the templates, you could try subclassing from
 ``BaseCommentAbstractModel``.
 ``BaseCommentAbstractModel``.
 
 
@@ -92,7 +80,7 @@ tricky: we have to both create a form and override
 field::
 field::
 
 
     from django import forms
     from django import forms
-    from django.contrib.comments.forms import CommentForm
+    from django_comments.forms import CommentForm
     from my_comment_app.models import CommentWithTitle
     from my_comment_app.models import CommentWithTitle
 
 
     class CommentFormWithTitle(CommentForm):
     class CommentFormWithTitle(CommentForm):
@@ -109,7 +97,7 @@ field::
             return data
             return data
 
 
 Django provides a couple of "helper" classes to make writing certain types of
 Django provides a couple of "helper" classes to make writing certain types of
-custom comment forms easier; see :mod:`django.contrib.comments.forms` for
+custom comment forms easier; see :mod:`django_comments.forms` for
 more.
 more.
 
 
 Finally, we'll define a couple of methods in ``my_comment_app/__init__.py`` to
 Finally, we'll define a couple of methods in ``my_comment_app/__init__.py`` to
@@ -145,7 +133,7 @@ explained in the next section.
 Custom comment app API
 Custom comment app API
 ======================
 ======================
 
 
-The :mod:`django.contrib.comments` app defines the following methods; any
+The :mod:`django_comments` app defines the following methods; any
 custom comment app must define at least one of them. All are optional,
 custom comment app must define at least one of them. All are optional,
 however.
 however.
 
 
@@ -153,11 +141,11 @@ however.
 
 
     Return the :class:`~django.db.models.Model` class to use for comments. This
     Return the :class:`~django.db.models.Model` class to use for comments. This
     model should inherit from
     model should inherit from
-    ``django.contrib.comments.models.BaseCommentAbstractModel``, which
+    ``django_comments.models.BaseCommentAbstractModel``, which
     defines necessary core fields.
     defines necessary core fields.
 
 
     The default implementation returns
     The default implementation returns
-    :class:`django.contrib.comments.models.Comment`.
+    :class:`django_comments.models.Comment`.
 
 
 .. function:: get_form()
 .. function:: get_form()
 
 
@@ -168,7 +156,7 @@ however.
     attached to.
     attached to.
 
 
     The default implementation returns
     The default implementation returns
-    :class:`django.contrib.comments.forms.CommentForm`.
+    :class:`django_comments.forms.CommentForm`.
 
 
     .. note::
     .. note::
 
 
@@ -192,25 +180,25 @@ however.
         want to use the default ``post_comment()`` view, you will
         want to use the default ``post_comment()`` view, you will
         need to be aware that it requires the model and form to have
         need to be aware that it requires the model and form to have
         certain additional attributes and methods: see the
         certain additional attributes and methods: see the
-        ``django.contrib.comments.views.post_comment()`` view for details.
+        ``django_comments.views.post_comment()`` view for details.
 
 
 .. function:: get_flag_url()
 .. function:: get_flag_url()
 
 
     Return the URL for the "flag this comment" view.
     Return the URL for the "flag this comment" view.
 
 
     The default implementation returns a reverse-resolved URL pointing
     The default implementation returns a reverse-resolved URL pointing
-    to the ``django.contrib.comments.views.moderation.flag()`` view.
+    to the ``django_comments.views.moderation.flag()`` view.
 
 
 .. function:: get_delete_url()
 .. function:: get_delete_url()
 
 
     Return the URL for the "delete this comment" view.
     Return the URL for the "delete this comment" view.
 
 
     The default implementation returns a reverse-resolved URL pointing
     The default implementation returns a reverse-resolved URL pointing
-    to the ``django.contrib.comments.views.moderation.delete()`` view.
+    to the ``django_comments.views.moderation.delete()`` view.
 
 
 .. function:: get_approve_url()
 .. function:: get_approve_url()
 
 
     Return the URL for the "approve this comment from moderation" view.
     Return the URL for the "approve this comment from moderation" view.
 
 
     The default implementation returns a reverse-resolved URL pointing
     The default implementation returns a reverse-resolved URL pointing
-    to the ``django.contrib.comments.views.moderation.approve()`` view.
+    to the ``django_comments.views.moderation.approve()`` view.

@@ -4,18 +4,6 @@
 Example of using the built-in comments app
 Example of using the built-in comments app
 ===========================================
 ===========================================
 
 
-.. warning::
-
-    Django's comment framework has been deprecated and is no longer supported.
-    Most users will be better served with a custom solution, or a hosted
-    product like Disqus__.
-
-    The code formerly known as ``django.contrib.comments`` is `still available
-    in an external repository`__.
-
-    __ https://disqus.com/
-    __ https://github.com/django/django-contrib-comments
-
 Follow the first three steps of the quick start guide in the
 Follow the first three steps of the quick start guide in the
 :doc:`documentation </ref/contrib/comments/index>`.
 :doc:`documentation </ref/contrib/comments/index>`.
 
 

+import os
+from setuptools import setup, find_packages
+
+try:
+    f = open(os.path.join(os.path.dirname(__file__), 'README.rst'))
+    long_description = f.read().strip()
+    f.close()
+except IOError:
+    long_description = None
+
+setup(
+    name='django-contrib.comments',
+    version='1.5',
+    url="http://github.com/django/django-contrib-comments",
+    description='The code formally known as django.contrib.comments.',
+    long_description=long_description,
+    author='Django Software Foundation',
+    author_email='jacob@jacobian.org',
+    license='BSD',
+    platforms='any',
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Web Environment',
+        'Framework :: Django',
+        'Intended Audience :: Developers',
+        'Natural Language :: English',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+    ],
+    packages=find_packages(exclude=['tests']),
+    include_package_data=True,
+    test_suite='tests.runtests.main',
+)
+

+#!/usr/bin/env python
+
+"""
+Adapted from django-constance, which itself was adapted from django-adminfiles.
+"""
+
+import os
+import sys
+
+here = os.path.dirname(os.path.abspath(__file__))
+parent = os.path.dirname(here)
+sys.path[0:0] = [here, parent]
+
+from django.conf import settings
+settings.configure(
+    DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3'}},
+    SECRET_KEY = "it's a secret to everyone",
+    INSTALLED_APPS = ["django_comments", "testapp", "custom_comments"],
+)
+
+from django.test.simple import DjangoTestSuiteRunner
+
+def main():
+    runner = DjangoTestSuiteRunner()
+    failures = runner.run_tests(['testapp'], verbosity=1, interactive=True)
+    sys.exit(failures)
+
+if __name__ == '__main__':
+    main()