From 7148929a5ef4a5fb8332a43f7d39394618313476 Mon Sep 17 00:00:00 2001
From: Jeff Willette <jrwillette88@gmail.com>
Date: Wed, 14 Sep 2016 02:45:24 +0900
Subject: [PATCH] Fixed #27216 -- Corrected import location in admin
deprecation messages.
---
django/contrib/admin/helpers.py | 4 ++--
django/contrib/admin/templatetags/admin_list.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py
index f808d8a899..157c90af47 100644
--- a/django/contrib/admin/helpers.py
+++ b/django/contrib/admin/helpers.py
@@ -213,8 +213,8 @@ class AdminReadonlyField(object):
if getattr(attr, "allow_tags", False):
warnings.warn(
"Deprecated allow_tags attribute used on %s. "
- "Use django.utils.safestring.format_html(), "
- "format_html_join(), or mark_safe() instead." % attr,
+ "Use django.utils.html.format_html(), format_html_join(), "
+ "or django.utils.safestring.mark_safe() instead." % attr,
RemovedInDjango20Warning
)
result_repr = mark_safe(value)
diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
index 63b428ec68..ce2a80cbc2 100644
--- a/django/contrib/admin/templatetags/admin_list.py
+++ b/django/contrib/admin/templatetags/admin_list.py
@@ -229,8 +229,8 @@ def items_for_result(cl, result, form):
if allow_tags:
warnings.warn(
"Deprecated allow_tags attribute used on field {}. "
- "Use django.utils.safestring.format_html(), "
- "format_html_join(), or mark_safe() instead.".format(field_name),
+ "Use django.utils.html.format_html(), format_html_join(), "
+ "or django.utils.safestring.mark_safe() instead.".format(field_name),
RemovedInDjango20Warning
)
result_repr = mark_safe(result_repr)