encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-05 04:50:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 2bad27231a into 65a0d083d6

Browse Source
This commit is contained in:
Eleni Lixourioti 2014-10-31 16:46:49 +00:00
commit 959ee34324
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/fields.py
View File

@ -11,6 +11,7 @@ import inspect
import re
import warnings
from decimal import Decimal, DecimalException
import django
from django import forms
from django.core import validators
from django.core.exceptions import ValidationError
@ -143,7 +144,10 @@ class Field(object):
self.label = None
if help_text is not None:
self.help_text = strip_multiple_choice_msg(smart_text(help_text))
help_text = smart_text(help_text)
if django.VERSION < (1, 6):
help_text = strip_multiple_choice_msg(help_text)
self.help_text = help_text
else:
self.help_text = None