mirror of
https://github.com/django/django.git
synced 2025-11-07 07:15:35 +00:00
Refs #27795 -- Replaced many force_text() with str()
Thanks Tim Graham for the review.
This commit is contained in:
@@ -4,7 +4,6 @@ import warnings
|
||||
from django.forms.utils import flatatt, pretty_name
|
||||
from django.forms.widgets import Textarea, TextInput
|
||||
from django.utils.deprecation import RemovedInDjango21Warning
|
||||
from django.utils.encoding import force_text
|
||||
from django.utils.functional import cached_property
|
||||
from django.utils.html import conditional_escape, format_html, html_safe
|
||||
from django.utils.inspect import func_supports_parameter
|
||||
@@ -213,9 +212,9 @@ class BoundField:
|
||||
Calculate and return the ID attribute for this BoundField, if the
|
||||
associated Form has specified auto_id. Return an empty string otherwise.
|
||||
"""
|
||||
auto_id = self.form.auto_id
|
||||
if auto_id and '%s' in force_text(auto_id):
|
||||
return force_text(auto_id) % self.html_name
|
||||
auto_id = self.form.auto_id # Boolean or string
|
||||
if auto_id and '%s' in str(auto_id):
|
||||
return auto_id % self.html_name
|
||||
elif auto_id:
|
||||
return self.html_name
|
||||
return ''
|
||||
|
||||
Reference in New Issue
Block a user