mirror of https://github.com/django/django.git
Fixed "byte string" typo in various docs and comments.
This commit is contained in:
parent
9ab1d55596
commit
881362986a
|
@ -146,15 +146,15 @@ class ContentFile(File):
|
||||||
|
|
||||||
|
|
||||||
def endswith_cr(line):
|
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')
|
return line.endswith('\r' if isinstance(line, str) else b'\r')
|
||||||
|
|
||||||
|
|
||||||
def endswith_lf(line):
|
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')
|
return line.endswith('\n' if isinstance(line, str) else b'\n')
|
||||||
|
|
||||||
|
|
||||||
def equals_lf(line):
|
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')
|
return line == ('\n' if isinstance(line, str) else b'\n')
|
||||||
|
|
|
@ -23,7 +23,7 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
|
||||||
sql_delete_procedure = 'DROP FUNCTION %(procedure)s(%(param_types)s)'
|
sql_delete_procedure = 'DROP FUNCTION %(procedure)s(%(param_types)s)'
|
||||||
|
|
||||||
def quote_value(self, value):
|
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()
|
return psycopg2.extensions.adapt(value).getquoted().decode()
|
||||||
|
|
||||||
def _field_indexes_sql(self, model, field):
|
def _field_indexes_sql(self, model, field):
|
||||||
|
|
|
@ -25,7 +25,7 @@ class SafeString(str, SafeData):
|
||||||
"""
|
"""
|
||||||
def __add__(self, rhs):
|
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.
|
safe string is safe. Otherwise, the result is no longer safe.
|
||||||
"""
|
"""
|
||||||
t = super().__add__(rhs)
|
t = super().__add__(rhs)
|
||||||
|
|
|
@ -145,7 +145,7 @@ Custom file upload handlers **must** define the following methods:
|
||||||
|
|
||||||
Receives a "chunk" of data from the file upload.
|
Receives a "chunk" of data from the file upload.
|
||||||
|
|
||||||
``raw_data`` is a byte string containing the uploaded data.
|
``raw_data`` is a bytestring containing the uploaded data.
|
||||||
|
|
||||||
``start`` is the position in the file where this ``raw_data`` chunk
|
``start`` is the position in the file where this ``raw_data`` chunk
|
||||||
begins.
|
begins.
|
||||||
|
|
|
@ -38,7 +38,7 @@ All attributes should be considered read-only, unless stated otherwise.
|
||||||
|
|
||||||
.. attribute:: HttpRequest.body
|
.. attribute:: HttpRequest.body
|
||||||
|
|
||||||
The raw HTTP request body as a byte string. This is useful for processing
|
The raw HTTP request body as a bytestring. This is useful for processing
|
||||||
data in different ways than conventional HTML forms: binary images,
|
data in different ways than conventional HTML forms: binary images,
|
||||||
XML payload etc. For processing conventional form data, use
|
XML payload etc. For processing conventional form data, use
|
||||||
:attr:`HttpRequest.POST`.
|
:attr:`HttpRequest.POST`.
|
||||||
|
|
|
@ -500,7 +500,7 @@ Python's copy of version 2.0.9. However, there are some incompatibilities
|
||||||
between other versions of ``simplejson``:
|
between other versions of ``simplejson``:
|
||||||
|
|
||||||
- While the ``simplejson`` API is documented as always returning unicode
|
- While the ``simplejson`` API is documented as always returning unicode
|
||||||
strings, the optional C implementation can return a byte string. This was
|
strings, the optional C implementation can return a bytestring. This was
|
||||||
fixed in Python 2.7.
|
fixed in Python 2.7.
|
||||||
- ``simplejson.JSONEncoder`` gained a ``namedtuple_as_object`` keyword
|
- ``simplejson.JSONEncoder`` gained a ``namedtuple_as_object`` keyword
|
||||||
argument in version 2.2.
|
argument in version 2.2.
|
||||||
|
@ -525,7 +525,7 @@ String types of hasher method parameters
|
||||||
If you have written a :ref:`custom password hasher <auth_password_storage>`,
|
If you have written a :ref:`custom password hasher <auth_password_storage>`,
|
||||||
your ``encode()``, ``verify()`` or ``safe_summary()`` methods should accept
|
your ``encode()``, ``verify()`` or ``safe_summary()`` methods should accept
|
||||||
Unicode parameters (``password``, ``salt`` or ``encoded``). If any of the
|
Unicode parameters (``password``, ``salt`` or ``encoded``). If any of the
|
||||||
hashing methods need byte strings, you can use the
|
hashing methods need bytestrings, you can use the
|
||||||
:func:`~django.utils.encoding.force_bytes` utility to encode the strings.
|
:func:`~django.utils.encoding.force_bytes` utility to encode the strings.
|
||||||
|
|
||||||
Validation of previous_page_number and next_page_number
|
Validation of previous_page_number and next_page_number
|
||||||
|
|
|
@ -105,7 +105,7 @@ Bugfixes
|
||||||
causing ``IntegrityError`` (:ticket:`23611`).
|
causing ``IntegrityError`` (:ticket:`23611`).
|
||||||
|
|
||||||
* Made :func:`~django.utils.http.urlsafe_base64_decode` return the proper
|
* Made :func:`~django.utils.http.urlsafe_base64_decode` return the proper
|
||||||
type (byte string) on Python 3 (:ticket:`23333`).
|
type (bytestring) on Python 3 (:ticket:`23333`).
|
||||||
|
|
||||||
* :djadmin:`makemigrations` can now serialize timezone-aware values
|
* :djadmin:`makemigrations` can now serialize timezone-aware values
|
||||||
(:ticket:`23365`).
|
(:ticket:`23365`).
|
||||||
|
|
|
@ -1111,7 +1111,7 @@ Miscellaneous
|
||||||
(or 200M, before 1.7.2) to 500M.
|
(or 200M, before 1.7.2) to 500M.
|
||||||
|
|
||||||
* ``reverse()`` and ``reverse_lazy()`` now return Unicode strings instead of
|
* ``reverse()`` and ``reverse_lazy()`` now return Unicode strings instead of
|
||||||
byte strings.
|
bytestrings.
|
||||||
|
|
||||||
* The ``CacheClass`` shim has been removed from all cache backends.
|
* The ``CacheClass`` shim has been removed from all cache backends.
|
||||||
These aliases were provided for backwards compatibility with Django 1.3.
|
These aliases were provided for backwards compatibility with Django 1.3.
|
||||||
|
|
Loading…
Reference in New Issue