diff options
author | Felipe Reyes <freyes@suse.com> | 2014-07-16 17:50:03 +0200 |
---|---|---|
committer | Felipe Reyes <freyes@suse.com> | 2014-08-06 14:34:53 +0200 |
commit | af49cf1f156e68dcd8d34a3de59c40ee5bd12b66 (patch) | |
tree | 5ec16171b2eaedc5c95da3b5e4fe2042d8f351d8 /horizon/forms | |
parent | b4d0310807562b57b8df1acb8f74bc46ea776996 (diff) | |
download | horizon-af49cf1f156e68dcd8d34a3de59c40ee5bd12b66.tar.gz |
Replace force_unicode with force_text
Django changed the name to force_unicode and it's only available in
python2 as an alias of force_text. The new name is available since
Django 1.4.2
Closes-Bug: #1345642
Change-Id: Ida8c545ceec7c31999f2497d540a0dc5a653d286
Diffstat (limited to 'horizon/forms')
-rw-r--r-- | horizon/forms/fields.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/horizon/forms/fields.py b/horizon/forms/fields.py index 584b9d330..58c06bf41 100644 --- a/horizon/forms/fields.py +++ b/horizon/forms/fields.py @@ -20,7 +20,7 @@ from django.core.exceptions import ValidationError # noqa from django.core import urlresolvers from django.forms import fields from django.forms import widgets -from django.utils.encoding import force_unicode +from django.utils.encoding import force_text from django.utils.functional import Promise # noqa from django.utils import html from django.utils.translation import ugettext_lazy as _ @@ -144,21 +144,21 @@ class SelectWidget(widgets.Select): super(SelectWidget, self).__init__(attrs, choices) def render_option(self, selected_choices, option_value, option_label): - option_value = force_unicode(option_value) + option_value = force_text(option_value) other_html = (option_value in selected_choices) and \ u' selected="selected"' or '' if not isinstance(option_label, (basestring, Promise)): for data_attr in self.data_attrs: data_value = html.conditional_escape( - force_unicode(getattr(option_label, - data_attr, ""))) + force_text(getattr(option_label, + data_attr, ""))) other_html += ' data-%s="%s"' % (data_attr, data_value) if self.transform: option_label = self.transform(option_label) return u'<option value="%s"%s>%s</option>' % ( html.escape(option_value), other_html, - html.conditional_escape(force_unicode(option_label))) + html.conditional_escape(force_text(option_label))) class DynamicSelectWidget(widgets.Select): |