summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2019-03-27 12:15:53 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-03-28 10:01:36 +0100
commit609b7f112346cc572cf3a5fd1a7c9d80ab1f1b36 (patch)
treed72ef649c3b88f4771341b29dcfd8475c974f187 /django
parentd7876fc9998452e867d9ef49cc7f5d37b5bce6e4 (diff)
[2.2.x] Fixed "byte string" typo in various docs and comments.
Backport of 881362986a1ee8f650752de8471a895890b71f96 from master
Diffstat (limited to 'django')
-rw-r--r--django/core/files/base.py6
-rw-r--r--django/db/backends/postgresql/schema.py2
-rw-r--r--django/utils/safestring.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/django/core/files/base.py b/django/core/files/base.py
index 63e3ee99a9..2ac662ed7c 100644
--- a/django/core/files/base.py
+++ b/django/core/files/base.py
@@ -146,15 +146,15 @@ class ContentFile(File):
def endswith_cr(line):
- """Return True if line (a text or byte string) ends with '\r'."""
+ """Return True if line (a text or bytestring) ends with '\r'."""
return line.endswith('\r' if isinstance(line, str) else b'\r')
def endswith_lf(line):
- """Return True if line (a text or byte string) ends with '\n'."""
+ """Return True if line (a text or bytestring) ends with '\n'."""
return line.endswith('\n' if isinstance(line, str) else b'\n')
def equals_lf(line):
- """Return True if line (a text or byte string) equals '\n'."""
+ """Return True if line (a text or bytestring) equals '\n'."""
return line == ('\n' if isinstance(line, str) else b'\n')
diff --git a/django/db/backends/postgresql/schema.py b/django/db/backends/postgresql/schema.py
index a81fd314e3..7d3482399e 100644
--- a/django/db/backends/postgresql/schema.py
+++ b/django/db/backends/postgresql/schema.py
@@ -22,7 +22,7 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
sql_delete_procedure = 'DROP FUNCTION %(procedure)s(%(param_types)s)'
def quote_value(self, value):
- # getquoted() returns a quoted byte string of the adapted value.
+ # getquoted() returns a quoted bytestring of the adapted value.
return psycopg2.extensions.adapt(value).getquoted().decode()
def _field_indexes_sql(self, model, field):
diff --git a/django/utils/safestring.py b/django/utils/safestring.py
index 5128add622..21d7c5503c 100644
--- a/django/utils/safestring.py
+++ b/django/utils/safestring.py
@@ -46,7 +46,7 @@ class SafeText(str, SafeData):
"""
def __add__(self, rhs):
"""
- Concatenating a safe string with another safe byte string or
+ Concatenating a safe string with another safe bytestring or
safe string is safe. Otherwise, the result is no longer safe.
"""
t = super().__add__(rhs)