Merge branch 'deprecate-comments'

1 files changed, 3 insertions, 0 deletions

diff --git a/django/contrib/comments/__init__.py b/django/contrib/comments/__init__.py
index 1798c1adb5..007b77ad7b 100644
--- a/django/contrib/comments/__init__.py
+++ b/django/contrib/comments/__init__.py
@@ -1,3 +1,4 @@
+import warnings
 from django.conf import settings
 from django.core import urlresolvers
 from django.core.exceptions import ImproperlyConfigured
@@ -5,6 +6,8 @@ from django.contrib.comments.models import Comment
 from django.contrib.comments.forms import CommentForm
 from django.utils.importlib import import_module
 
+warnings.warn("django.contrib.comments is deprecated and will be removed before Django 1.8.", PendingDeprecationWarning)
+
 DEFAULT_COMMENTS_APP = 'django.contrib.comments'
 
 def get_comment_app():