Refs #27753 -- Favored SafeString over SafeText.

4 files changed, 12 insertions, 12 deletions

diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py
index e9db668a4d..4be5a193bb 100644
--- a/django/db/backends/postgresql/base.py
+++ b/django/db/backends/postgresql/base.py
@@ -13,7 +13,7 @@ from django.db import connections
 from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.utils import DatabaseError as WrappedDatabaseError
 from django.utils.functional import cached_property
-from django.utils.safestring import SafeText
+from django.utils.safestring import SafeString
 from django.utils.version import get_version_tuple
 
 try:
@@ -44,7 +44,7 @@ from .operations import DatabaseOperations                  # NOQA isort:skip
 from .schema import DatabaseSchemaEditor                    # NOQA isort:skip
 from .utils import utc_tzinfo_factory                       # NOQA isort:skip
 
-psycopg2.extensions.register_adapter(SafeText, psycopg2.extensions.QuotedString)
+psycopg2.extensions.register_adapter(SafeString, psycopg2.extensions.QuotedString)
 psycopg2.extras.register_uuid()
 
 # Register support for inet[] manually so we don't have to handle the Inet()
diff --git a/django/template/backends/utils.py b/django/template/backends/utils.py
index 8d41213965..1396ae7095 100644
--- a/django/template/backends/utils.py
+++ b/django/template/backends/utils.py
@@ -1,7 +1,7 @@
 from django.middleware.csrf import get_token
 from django.utils.functional import lazy
 from django.utils.html import format_html
-from django.utils.safestring import SafeText
+from django.utils.safestring import SafeString
 
 
 def csrf_input(request):
@@ -10,5 +10,5 @@ def csrf_input(request):
         get_token(request))
 
 
-csrf_input_lazy = lazy(csrf_input, SafeText, str)
+csrf_input_lazy = lazy(csrf_input, SafeString, str)
 csrf_token_lazy = lazy(get_token, str)
diff --git a/django/utils/html.py b/django/utils/html.py
index 44a3f16459..9c519978f5 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -9,7 +9,7 @@ from urllib.parse import (
 
 from django.utils.functional import Promise, keep_lazy, keep_lazy_text
 from django.utils.http import RFC3986_GENDELIMS, RFC3986_SUBDELIMS
-from django.utils.safestring import SafeData, SafeText, mark_safe
+from django.utils.safestring import SafeData, SafeString, mark_safe
 from django.utils.text import normalize_newlines
 
 # Configuration for urlize() function.
@@ -33,7 +33,7 @@ _html_escapes = {
 }
 
 
-@keep_lazy(str, SafeText)
+@keep_lazy(str, SafeString)
 def escape(text):
     """
     Return the given text with ampersands, quotes and angle brackets encoded
@@ -65,7 +65,7 @@ _js_escapes = {
 _js_escapes.update((ord('%c' % z), '\\u%04X' % z) for z in range(32))
 
 
-@keep_lazy(str, SafeText)
+@keep_lazy(str, SafeString)
 def escapejs(value):
     """Hex encode characters for use in JavaScript strings."""
     return mark_safe(str(value).translate(_js_escapes))
@@ -372,7 +372,7 @@ def avoid_wrapping(value):
 def html_safe(klass):
     """
     A decorator that defines the __html__ method. This helps non-Django
-    templates to detect classes whose __str__ methods return SafeText.
+    templates to detect classes whose __str__ methods return SafeString.
     """
     if '__html__' in klass.__dict__:
         raise ValueError(
diff --git a/django/utils/safestring.py b/django/utils/safestring.py
index 93d74f602d..dcdaf26171 100644
--- a/django/utils/safestring.py
+++ b/django/utils/safestring.py
@@ -18,7 +18,7 @@ class SafeData:
         return self
 
 
-class SafeText(str, SafeData):
+class SafeString(str, SafeData):
     """
     A str subclass that has been specifically marked as "safe" for HTML output
     purposes.
@@ -30,14 +30,14 @@ class SafeText(str, SafeData):
         """
         t = super().__add__(rhs)
         if isinstance(rhs, SafeData):
-            return SafeText(t)
+            return SafeString(t)
         return t
 
     def __str__(self):
         return self
 
 
-SafeString = SafeText
+SafeText = SafeString  # For backwards compatibility since Django 2.0.
 
 
 def _safety_decorator(safety_marker, func):
@@ -60,4 +60,4 @@ def mark_safe(s):
         return s
     if callable(s):
         return _safety_decorator(mark_safe, s)
-    return SafeText(s)
+    return SafeString(s)