Removed contrib.comments per deprecation timeline. (aa93a189) · Commits · Dom Sekotill / django

MANIFEST.in

+0 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ recursive-include django/contrib/admindocs/templates *
		recursive-include django/contrib/auth/fixtures *
		recursive-include django/contrib/auth/templates *
		recursive-include django/contrib/auth/tests/templates *
		recursive-include django/contrib/comments/templates *
		recursive-include django/contrib/formtools/templates *
		recursive-include django/contrib/formtools/tests/templates *
		recursive-include django/contrib/flatpages/fixtures *

django/conf/global_settings.py

+0 −10

Original line number	Diff line number	Diff line
		@@ -500,16 +500,6 @@ CACHE_MIDDLEWARE_KEY_PREFIX = ''
		CACHE_MIDDLEWARE_SECONDS = 600
		CACHE_MIDDLEWARE_ALIAS = 'default'

		####################
		# COMMENTS #
		####################

		COMMENTS_ALLOW_PROFANITIES = False

		# The profanities that will trigger a validation error in
		# CommentDetailsForm.clean_comment. All of these should be in lowercase.
		PROFANITIES_LIST = ()

		##################
		# AUTHENTICATION #
		##################

django/contrib/comments/init.py

deleted100644 → 0

+0 −93

Original line number	Diff line number	Diff line
		from importlib import import_module
		import warnings

		from django.apps import apps as django_apps
		from django.conf import settings
		from django.core import urlresolvers
		from django.core.exceptions import ImproperlyConfigured
		from django.contrib.comments.models import Comment
		from django.contrib.comments.forms import CommentForm
		from django.utils.deprecation import RemovedInDjango18Warning


		warnings.warn("django.contrib.comments is deprecated and will be removed before Django 1.8.", RemovedInDjango18Warning)

		DEFAULT_COMMENTS_APP = 'django.contrib.comments'

		def get_comment_app():
		"""
		Get the comment app (i.e. "django.contrib.comments") as defined in the settings
		"""
		try:
		app_config = django_apps.get_app_config(get_comment_app_name().rpartition(".")[2])
		except LookupError:
		raise ImproperlyConfigured("The COMMENTS_APP (%r) "
		"must be in INSTALLED_APPS" % settings.COMMENTS_APP)
		return app_config.module

		def get_comment_app_name():
		"""
		Returns the name of the comment app (either the setting value, if it
		exists, or the default).
		"""
		return getattr(settings, 'COMMENTS_APP', DEFAULT_COMMENTS_APP)

		def get_model():
		"""
		Returns the comment model class.
		"""
		if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_model"):
		return get_comment_app().get_model()
		else:
		return Comment

		def get_form():
		"""
		Returns the comment ModelForm class.
		"""
		if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_form"):
		return get_comment_app().get_form()
		else:
		return CommentForm

		def get_form_target():
		"""
		Returns the target URL for the comment form submission view.
		"""
		if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_form_target"):
		return get_comment_app().get_form_target()
		else:
		return urlresolvers.reverse("django.contrib.comments.views.comments.post_comment")

		def get_flag_url(comment):
		"""
		Get the URL for the "flag this comment" view.
		"""
		if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_flag_url"):
		return get_comment_app().get_flag_url(comment)
		else:
		return urlresolvers.reverse("django.contrib.comments.views.moderation.flag",
		args=(comment.id,))

		def get_delete_url(comment):
		"""
		Get the URL for the "delete this comment" view.
		"""
		if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_delete_url"):
		return get_comment_app().get_delete_url(comment)
		else:
		return urlresolvers.reverse("django.contrib.comments.views.moderation.delete",
		args=(comment.id,))

		def get_approve_url(comment):
		"""
		Get the URL for the "approve this comment from moderation" view.
		"""
		if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_approve_url"):
		return get_comment_app().get_approve_url(comment)
		else:
		return urlresolvers.reverse("django.contrib.comments.views.moderation.approve",
		args=(comment.id,))


		default_app_config = 'django.contrib.comments.apps.CommentsConfig'

django/contrib/comments/admin.py

deleted100644 → 0

+0 −86

Original line number	Diff line number	Diff line
		from __future__ import unicode_literals

		from django.contrib import admin
		from django.contrib.auth import get_user_model
		from django.contrib.comments.models import Comment
		from django.utils.translation import ugettext_lazy as _, ungettext_lazy
		from django.contrib.comments import get_model
		from django.contrib.comments.views.moderation import perform_flag, perform_approve, perform_delete


		class UsernameSearch(object):
		"""The User object may not be auth.User, so we need to provide
		a mechanism for issuing the equivalent of a .filter(user__username=...)
		search in CommentAdmin.
		"""
		def __str__(self):
		return 'user__%s' % get_user_model().USERNAME_FIELD


		class CommentsAdmin(admin.ModelAdmin):
		fieldsets = (
		(None,
		{'fields': ('content_type', 'object_pk', 'site')}
		),
		(_('Content'),
		{'fields': ('user', 'user_name', 'user_email', 'user_url', 'comment')}
		),
		(_('Metadata'),
		{'fields': ('submit_date', 'ip_address', 'is_public', 'is_removed')}
		),
		)

		list_display = ('name', 'content_type', 'object_pk', 'ip_address', 'submit_date', 'is_public', 'is_removed')
		list_filter = ('submit_date', 'site', 'is_public', 'is_removed')
		date_hierarchy = 'submit_date'
		ordering = ('-submit_date',)
		raw_id_fields = ('user',)
		search_fields = ('comment', UsernameSearch(), 'user_name', 'user_email', 'user_url', 'ip_address')
		actions = ["flag_comments", "approve_comments", "remove_comments"]

		def get_actions(self, request):
		actions = super(CommentsAdmin, self).get_actions(request)
		# Only superusers should be able to delete the comments from the DB.
		if not request.user.is_superuser and 'delete_selected' in actions:
		actions.pop('delete_selected')
		if not request.user.has_perm('comments.can_moderate'):
		if 'approve_comments' in actions:
		actions.pop('approve_comments')
		if 'remove_comments' in actions:
		actions.pop('remove_comments')
		return actions

		def flag_comments(self, request, queryset):
		self._bulk_flag(request, queryset, perform_flag,
		ungettext_lazy('%d comment was successfully flagged',
		'%d comments were successfully flagged'))
		flag_comments.short_description = _("Flag selected comments")

		def approve_comments(self, request, queryset):
		self._bulk_flag(request, queryset, perform_approve,
		ungettext_lazy('%d comment was successfully approved',
		'%d comments were successfully approved'))
		approve_comments.short_description = _("Approve selected comments")

		def remove_comments(self, request, queryset):
		self._bulk_flag(request, queryset, perform_delete,
		ungettext_lazy('%d comment was successfully removed',
		'%d comments were successfully removed'))
		remove_comments.short_description = _("Remove selected comments")

		def _bulk_flag(self, request, queryset, action, done_message):
		"""
		Flag, approve, or remove some comments from an admin action. Actually
		calls the `action` argument to perform the heavy lifting.
		"""
		n_comments = 0
		for comment in queryset:
		action(request, comment)
		n_comments += 1

		self.message_user(request, done_message % n_comments)

		# Only register the default admin if the model is the built-in comment model
		# (this won't be true if there's a custom comment app).
		if get_model() is Comment:
		admin.site.register(Comment, CommentsAdmin)

django/contrib/comments/apps.py

deleted100644 → 0

+0 −8

Original line number	Diff line number	Diff line
		from django.apps import AppConfig

		from django.utils.translation import ugettext_lazy as _


		class CommentsConfig(AppConfig):
		name = 'django.contrib.comments'
		verbose_name = _("Comments")