From c9d4497d816023e30a7adfc9f2b74eea966ff17c Mon Sep 17 00:00:00 2001
From: José Padilla
Date: Fri, 5 Sep 2014 15:58:53 -0700
Subject: Use force_text from compat

---
 rest_framework/utils/formatting.py | 5 ++---
 1 file 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):
-- 
cgit v1.2.3