[^\s;]+)', re.I)
@@ -405,7 +405,7 @@ class HttpResponseRedirectBase(HttpResponse):
def __init__(self, redirect_to, *args, **kwargs):
super().__init__(*args, **kwargs)
self['Location'] = iri_to_uri(redirect_to)
- parsed = urlparse(force_text(redirect_to))
+ parsed = urlparse(str(redirect_to))
if parsed.scheme and parsed.scheme not in self.allowed_schemes:
raise DisallowedRedirect("Unsafe redirect to URL with protocol '%s'" % parsed.scheme)
diff --git a/django/shortcuts.py b/django/shortcuts.py
index 0ce7ee327f..6fe3d2d590 100644
--- a/django/shortcuts.py
+++ b/django/shortcuts.py
@@ -11,7 +11,6 @@ from django.http import (
from django.template import loader
from django.urls import NoReverseMatch, reverse
from django.utils.deprecation import RemovedInDjango30Warning
-from django.utils.encoding import force_text
from django.utils.functional import Promise
@@ -138,7 +137,7 @@ def resolve_url(to, *args, **kwargs):
if isinstance(to, Promise):
# Expand the lazy instance, as it can cause issues when it is passed
# further to some Python functions like urlparse.
- to = force_text(to)
+ to = str(to)
if isinstance(to, str):
# Handle relative URLs
diff --git a/django/urls/resolvers.py b/django/urls/resolvers.py
index 9b8462903e..8bb80c86cb 100644
--- a/django/urls/resolvers.py
+++ b/django/urls/resolvers.py
@@ -16,7 +16,6 @@ from django.core.checks import Warning
from django.core.checks.urls import check_resolver
from django.core.exceptions import ImproperlyConfigured
from django.utils.datastructures import MultiValueDict
-from django.utils.encoding import force_text
from django.utils.functional import cached_property
from django.utils.http import RFC3986_SUBDELIMS
from django.utils.regex_helper import normalize
@@ -92,7 +91,7 @@ class LocaleRegexDescriptor:
return instance.__dict__['regex']
language_code = get_language()
if language_code not in instance._regex_dict:
- instance._regex_dict[language_code] = self._compile(force_text(instance._regex))
+ instance._regex_dict[language_code] = self._compile(str(instance._regex))
return instance._regex_dict[language_code]
def _compile(self, regex):
@@ -347,7 +346,7 @@ class RegexURLResolver(LocaleRegexProvider):
return name in self._callback_strs
def resolve(self, path):
- path = force_text(path) # path may be a reverse_lazy object
+ path = str(path) # path may be a reverse_lazy object
tried = []
match = self.regex.search(path)
if match:
@@ -422,8 +421,8 @@ class RegexURLResolver(LocaleRegexProvider):
def _reverse_with_prefix(self, lookup_view, _prefix, *args, **kwargs):
if args and kwargs:
raise ValueError("Don't mix *args and **kwargs in call to reverse()!")
- text_args = [force_text(v) for v in args]
- text_kwargs = {k: force_text(v) for (k, v) in kwargs.items()}
+ text_args = [str(v) for v in args]
+ text_kwargs = {k: str(v) for (k, v) in kwargs.items()}
if not self._populated:
self._populate()
diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py
index 6c8cab61f5..d3f586aacf 100644
--- a/django/utils/dateformat.py
+++ b/django/utils/dateformat.py
@@ -18,7 +18,6 @@ import time
from django.utils.dates import (
MONTHS, MONTHS_3, MONTHS_ALT, MONTHS_AP, WEEKDAYS, WEEKDAYS_ABBR,
)
-from django.utils.encoding import force_text
from django.utils.timezone import get_default_timezone, is_aware, is_naive
from django.utils.translation import gettext as _
@@ -29,14 +28,14 @@ re_escaped = re.compile(r'\\(.)')
class Formatter:
def format(self, formatstr):
pieces = []
- for i, piece in enumerate(re_formatchars.split(force_text(formatstr))):
+ for i, piece in enumerate(re_formatchars.split(str(formatstr))):
if i % 2:
if type(self.data) is datetime.date and hasattr(TimeFormat, piece):
raise TypeError(
"The format for date objects may not contain "
"time-related format specifiers (found '%s')." % piece
)
- pieces.append(force_text(getattr(self, piece)()))
+ pieces.append(str(getattr(self, piece)()))
elif piece:
pieces.append(re_escaped.sub(r'\1', piece))
return ''.join(pieces)
diff --git a/django/utils/html.py b/django/utils/html.py
index 25843ce576..9f4f58c7a1 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -43,7 +43,7 @@ def escape(text):
conditional_escape() instead.
"""
return mark_safe(
- force_text(text).replace('&', '&').replace('<', '<')
+ str(text).replace('&', '&').replace('<', '<')
.replace('>', '>').replace('"', '"').replace("'", ''')
)
@@ -70,7 +70,7 @@ _js_escapes.update((ord('%c' % z), '\\u%04X' % z) for z in range(32))
@keep_lazy(str, SafeText)
def escapejs(value):
"""Hex encode characters for use in JavaScript strings."""
- return mark_safe(force_text(value).translate(_js_escapes))
+ return mark_safe(str(value).translate(_js_escapes))
def conditional_escape(text):
@@ -121,8 +121,8 @@ def format_html_join(sep, format_string, args_generator):
@keep_lazy_text
def linebreaks(value, autoescape=False):
"""Convert newlines into and
s."""
- value = normalize_newlines(force_text(value))
- paras = re.split('\n{2,}', value)
+ value = normalize_newlines(value)
+ paras = re.split('\n{2,}', str(value))
if autoescape:
paras = ['
%s
' % escape(p).replace('\n', '
') for p in paras]
else:
diff --git a/django/utils/text.py b/django/utils/text.py
index cd9e704ea1..3e04f8bec7 100644
--- a/django/utils/text.py
+++ b/django/utils/text.py
@@ -4,7 +4,6 @@ import unicodedata
from gzip import GzipFile
from io import BytesIO
-from django.utils.encoding import force_text
from django.utils.functional import (
SimpleLazyObject, keep_lazy, keep_lazy_text, lazy,
)
@@ -15,7 +14,7 @@ from django.utils.translation import gettext as _, gettext_lazy, pgettext
@keep_lazy_text
def capfirst(x):
"""Capitalize the first letter of a string."""
- return x and force_text(x)[0].upper() + force_text(x)[1:]
+ return x and str(x)[0].upper() + str(x)[1:]
# Set up regular expressions
@@ -62,7 +61,7 @@ class Truncator(SimpleLazyObject):
An object used to truncate text, either by characters or words.
"""
def __init__(self, text):
- super().__init__(lambda: force_text(text))
+ super().__init__(lambda: str(text))
def add_truncation_text(self, text, truncate=None):
if truncate is None:
@@ -230,7 +229,7 @@ def get_valid_filename(s):
>>> get_valid_filename("john's portrait in 2004.jpg")
'johns_portrait_in_2004.jpg'
"""
- s = force_text(s).strip().replace(' ', '_')
+ s = str(s).strip().replace(' ', '_')
return re.sub(r'(?u)[^-\w.]', '', s)
@@ -251,18 +250,17 @@ def get_text_list(list_, last_word=gettext_lazy('or')):
if len(list_) == 0:
return ''
if len(list_) == 1:
- return force_text(list_[0])
+ return str(list_[0])
return '%s %s %s' % (
# Translators: This string is used as a separator between list elements
- _(', ').join(force_text(i) for i in list_[:-1]),
- force_text(last_word), force_text(list_[-1]))
+ _(', ').join(str(i) for i in list_[:-1]), str(last_word), str(list_[-1])
+ )
@keep_lazy_text
def normalize_newlines(text):
"""Normalize CRLF and CR newlines to just LF."""
- text = force_text(text)
- return re_newlines.sub('\n', text)
+ return re_newlines.sub('\n', str(text))
@keep_lazy_text
@@ -349,8 +347,7 @@ def smart_split(text):
>>> list(smart_split(r'A "\"funky\" style" test.'))
['A', '"\\"funky\\" style"', 'test.']
"""
- text = force_text(text)
- for bit in smart_split_re.finditer(text):
+ for bit in smart_split_re.finditer(str(text)):
yield bit.group(0)
@@ -378,7 +375,7 @@ _entity_re = re.compile(r"&(#?[xX]?(?:[0-9a-fA-F]+|\w{1,8}));")
@keep_lazy_text
def unescape_entities(text):
- return _entity_re.sub(_replace_entity, force_text(text))
+ return _entity_re.sub(_replace_entity, str(text))
@keep_lazy_text
@@ -409,7 +406,7 @@ def slugify(value, allow_unicode=False):
Remove characters that aren't alphanumerics, underscores, or hyphens.
Convert to lowercase. Also strip leading and trailing whitespace.
"""
- value = force_text(value)
+ value = str(value)
if allow_unicode:
value = unicodedata.normalize('NFKC', value)
else:
diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py
index dc4936a976..f342cf7227 100644
--- a/django/utils/translation/__init__.py
+++ b/django/utils/translation/__init__.py
@@ -6,7 +6,6 @@ import warnings
from contextlib import ContextDecorator
from django.utils.deprecation import RemovedInDjango21Warning
-from django.utils.encoding import force_text
from django.utils.functional import lazy
__all__ = [
@@ -226,7 +225,7 @@ def _string_concat(*strings):
'django.utils.translate.string_concat() is deprecated in '
'favor of django.utils.text.format_lazy().',
RemovedInDjango21Warning, stacklevel=2)
- return ''.join(force_text(s) for s in strings)
+ return ''.join(str(s) for s in strings)
string_concat = lazy(_string_concat, str)
diff --git a/django/views/debug.py b/django/views/debug.py
index d32188b346..d3361486cb 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -287,7 +287,7 @@ class ExceptionReporter:
user_str = None
else:
try:
- user_str = force_text(self.request.user)
+ user_str = str(self.request.user)
except Exception:
# request.user may raise OperationalError if the database is
# unavailable, for example.
@@ -318,7 +318,7 @@ class ExceptionReporter:
if self.exc_type:
c['exception_type'] = self.exc_type.__name__
if self.exc_value:
- c['exception_value'] = force_text(self.exc_value, errors='replace')
+ c['exception_value'] = str(self.exc_value)
if frames:
c['lastframe'] = frames[-1]
return c
diff --git a/django/views/defaults.py b/django/views/defaults.py
index e9057c455e..dee081ec3d 100644
--- a/django/views/defaults.py
+++ b/django/views/defaults.py
@@ -3,7 +3,6 @@ from django.http import (
HttpResponseServerError,
)
from django.template import Context, Engine, TemplateDoesNotExist, loader
-from django.utils.encoding import force_text
from django.views.decorators.csrf import requires_csrf_token
ERROR_404_TEMPLATE_NAME = '404.html'
@@ -117,5 +116,5 @@ def permission_denied(request, exception, template_name=ERROR_403_TEMPLATE_NAME)
raise
return HttpResponseForbidden('403 Forbidden
', content_type='text/html')
return HttpResponseForbidden(
- template.render(request=request, context={'exception': force_text(exception)})
+ template.render(request=request, context={'exception': str(exception)})
)
diff --git a/django/views/generic/edit.py b/django/views/generic/edit.py
index 3dff9ece33..ad2f2b1c67 100644
--- a/django/views/generic/edit.py
+++ b/django/views/generic/edit.py
@@ -1,7 +1,6 @@
from django.core.exceptions import ImproperlyConfigured
from django.forms import models as model_forms
from django.http import HttpResponseRedirect
-from django.utils.encoding import force_text
from django.views.generic.base import ContextMixin, TemplateResponseMixin, View
from django.views.generic.detail import (
BaseDetailView, SingleObjectMixin, SingleObjectTemplateResponseMixin,
@@ -49,13 +48,9 @@ class FormMixin(ContextMixin):
def get_success_url(self):
"""Return the URL to redirect to after processing a valid form."""
- if self.success_url:
- # Forcing possible reverse_lazy evaluation
- url = force_text(self.success_url)
- else:
- raise ImproperlyConfigured(
- "No URL to redirect to. Provide a success_url.")
- return url
+ if not self.success_url:
+ raise ImproperlyConfigured("No URL to redirect to. Provide a success_url.")
+ return str(self.success_url) # success_url may be lazy
def form_valid(self, form):
"""If the form is valid, redirect to the supplied URL."""
diff --git a/docs/howto/custom-model-fields.txt b/docs/howto/custom-model-fields.txt
index 54a62c50db..a64790b34c 100644
--- a/docs/howto/custom-model-fields.txt
+++ b/docs/howto/custom-model-fields.txt
@@ -706,10 +706,10 @@ smoothly:
2. Put a ``__str__()`` method on the class you're wrapping up as a field. There
are a lot of places where the default behavior of the field code is to call
- :func:`~django.utils.encoding.force_text` on the value. (In our
- examples in this document, ``value`` would be a ``Hand`` instance, not a
- ``HandField``). So if your ``__str__()`` method automatically converts to
- the string form of your Python object, you can save yourself a lot of work.
+ ``str()`` on the value. (In our examples in this document, ``value`` would
+ be a ``Hand`` instance, not a ``HandField``). So if your ``__str__()``
+ method automatically converts to the string form of your Python object, you
+ can save yourself a lot of work.
Writing a ``FileField`` subclass
================================
diff --git a/docs/topics/serialization.txt b/docs/topics/serialization.txt
index fd1c8876ec..9a1b977d98 100644
--- a/docs/topics/serialization.txt
+++ b/docs/topics/serialization.txt
@@ -256,13 +256,12 @@ For example, if you have some custom type in an object to be serialized, you'll
have to write a custom :mod:`json` encoder for it. Something like this will
work::
- from django.utils.encoding import force_text
from django.core.serializers.json import DjangoJSONEncoder
class LazyEncoder(DjangoJSONEncoder):
def default(self, obj):
if isinstance(obj, YourCustomType):
- return force_text(obj)
+ return str(obj)
return super().default(obj)
You can then pass ``cls=LazyEncoder`` to the ``serializers.serialize()``