encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-26 11:33:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use 'force_text', not 'unicode', for compat across python version

Browse Source
This commit is contained in:
Tom Christie 2013-07-05 09:07:18 +01:00
parent 676ab4971c
commit 8f79caf9d1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/fields.py
View File

@ -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, '')

2
rest_framework/tests/test_serializer.py
View File

@ -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):