Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #27216 -- Corrected import location in admin deprecation messages. #7242

Merged
merged 2 commits into from Sep 13, 2016
Merged

Fixed #27216 -- Corrected import location in admin deprecation messages. #7242

merged 2 commits into from Sep 13, 2016

Conversation

jeffwillette
Copy link
Contributor

@jeffwillette jeffwillette commented Sep 13, 2016

Fixed the referenced deprecation messages

@timgraham timgraham changed the title Fix #27216 Wrong import location in deprecation message Fixed #27216 -- Corrected import location in admin deprecation messages. Sep 13, 2016
@@ -213,7 +213,7 @@ def contents(self):
if getattr(attr, "allow_tags", False):
warnings.warn(
"Deprecated allow_tags attribute used on %s. "
"Use django.utils.safestring.format_html(), "
"Use django.utils.html.format_html(), "
"format_html_join(), or mark_safe() instead." % attr,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

django.utils.safestring.mark_safe()

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yes of course, do these need to be squashed into one commit?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, please, and take into account the pull request title changed by Tim.

@timgraham timgraham merged commit 7148929 into django:master Sep 13, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants