diff options
| author | José Padilla | 2014-09-05 15:58:53 -0700 | 
|---|---|---|
| committer | José Padilla | 2014-09-05 15:58:53 -0700 | 
| commit | c9d4497d816023e30a7adfc9f2b74eea966ff17c (patch) | |
| tree | ba261ba476b9d9c3b6289cf0aa9be75ee6aa7ab8 | |
| parent | 3e20b0110cc30c112906cc473e04e837737ff4f5 (diff) | |
| download | django-rest-framework-c9d4497d816023e30a7adfc9f2b74eea966ff17c.tar.bz2 | |
Use force_text from compat
| -rw-r--r-- | rest_framework/utils/formatting.py | 5 | 
1 files changed, 2 insertions, 3 deletions
| diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index bca697ae..470af51b 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -2,13 +2,12 @@  Utility functions to return a formatted name and description for a given view.  """  from __future__ import unicode_literals +import re  from django.utils.html import escape  from django.utils.safestring import mark_safe -from django.utils.encoding import force_text -from rest_framework.compat import apply_markdown -import re +from rest_framework.compat import apply_markdown, force_text  def remove_trailing_string(content, trailing): | 
