From 8f79caf9d1bd4a3de8371c61f24dcf513454f06b Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 5 Jul 2013 09:07:18 +0100
Subject: Use 'force_text', not 'unicode', for compat across python version

---
 rest_framework/fields.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'rest_framework/fields.py')

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 1a0ad3b9..6e5ee470 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -102,13 +102,13 @@ def humanize_strptime(format_string):
 
 def strip_multiple_choice_msg(help_text):
     """
-    Remove the 'Hold down "control" ...' message that is enforced in select
-    multiple fields.
+    Remove the 'Hold down "control" ...' message that is Django enforces in
+    select multiple fields on ModelForms.  (Required for 1.5 and earlier)
 
     See https://code.djangoproject.com/ticket/9321
     """
     multiple_choice_msg = _(' Hold down "Control", or "Command" on a Mac, to select more than one.')
-    multiple_choice_msg = unicode(multiple_choice_msg)
+    multiple_choice_msg = force_text(multiple_choice_msg)
 
     return help_text.replace(multiple_choice_msg, '')
 
-- 
cgit v1.2.3