From 7d43f41e4aa50c4258ec1d7b63dd62a01440fa9d Mon Sep 17 00:00:00 2001
From: Andy Freeland
Date: Thu, 4 Jul 2013 01:51:24 -0400
Subject: Remove 'Hold down "Control" ...' message from help_text

When getting the help_text from a field where `many=True`, Django
appends 'Hold down "Control", or "Command" on a Mac, to select more than
one.' to the help_text. This makes some sense in Django's ModelForms,
but no sense in the API.
---
 rest_framework/tests/test_serializer.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'rest_framework/tests/test_serializer.py')

diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index 8b87a084..6c18f15c 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -1376,6 +1376,18 @@ class FieldLabelTest(TestCase):
         self.assertEqual('Label', relations.HyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help', many=True).label)
 
 
+# Test for issue #961
+
+class ManyFieldHelpTextTest(TestCase):
+    def test_help_text_no_hold_down_control_msg(self):
+        """
+        Validate that help_text doesn't contain the 'Hold down "Control" ...'
+        message that Django appends to choice fields.
+        """
+        rel_field = fields.Field(help_text=ManyToManyModel._meta.get_field('rel').help_text)
+        self.assertEqual('Some help text.', unicode(rel_field.help_text))
+
+
 class AttributeMappingOnAutogeneratedFieldsTests(TestCase):
 
     def setUp(self):
-- 
cgit v1.2.3


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/tests/test_serializer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/tests/test_serializer.py')

diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index 6c18f15c..38acc354 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -1385,7 +1385,7 @@ class ManyFieldHelpTextTest(TestCase):
         message that Django appends to choice fields.
         """
         rel_field = fields.Field(help_text=ManyToManyModel._meta.get_field('rel').help_text)
-        self.assertEqual('Some help text.', unicode(rel_field.help_text))
+        self.assertEqual('Some help text.', rel_field.help_text)
 
 
 class AttributeMappingOnAutogeneratedFieldsTests(TestCase):
-- 
cgit v1.2.3


From b6d6feaa0210bef225f2dad0d5765b32ecfc8cd0 Mon Sep 17 00:00:00 2001
From: Pavel Zinovkin
Date: Sun, 21 Jul 2013 22:43:19 +0400
Subject: Fixed test

---
 rest_framework/tests/test_serializer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/tests/test_serializer.py')

diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index 38acc354..c2497660 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -494,7 +494,7 @@ class CustomValidationTests(TestCase):
         }
         serializer = self.CommentSerializerWithFieldValidator(data=wrong_data)
         self.assertFalse(serializer.is_valid())
-        self.assertEqual(serializer.errors, {'email': ['Enter a valid e-mail address.']})
+        self.assertEqual(serializer.errors, {'email': ['Enter a valid email address.']})
 
 
 class PositiveIntegerAsChoiceTests(TestCase):
-- 
cgit v1.2.3