summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2016-08-24 00:44:31 (GMT)
committerR David Murray <rdmurray@bitdance.com>2016-08-24 00:44:31 (GMT)
commitd44500cc291930cdda9f1b0636e85df2162c4bfd (patch)
tree2365c6411e23ea3e8a243c80e1153e9742d3fdea /Doc
parentcdb5cee9804a1cdc491c18118a92c4592218a894 (diff)
parent48de28290ca1f71ddaa04553997e53c8fcf7e14e (diff)
downloadcpython-d44500cc291930cdda9f1b0636e85df2162c4bfd.zip
cpython-d44500cc291930cdda9f1b0636e85df2162c4bfd.tar.gz
cpython-d44500cc291930cdda9f1b0636e85df2162c4bfd.tar.bz2
Merge: #25916: fix a few 'string of bytes' references.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/howto/unicode.rst2
-rw-r--r--Doc/library/logging.config.rst2
-rw-r--r--Doc/library/sunau.rst2
-rw-r--r--Doc/library/wave.rst2
4 files changed, 4 insertions, 4 deletions
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
index fbeb11a..a48ae1f 100644
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -192,7 +192,7 @@ frequently used than UTF-8.) UTF-8 uses the following rules:
UTF-8 has several convenient properties:
1. It can handle any Unicode code point.
-2. A Unicode string is turned into a string of bytes containing no embedded zero
+2. A Unicode string is turned into a sequence of bytes containing no embedded zero
bytes. This avoids byte-ordering issues, and means UTF-8 strings can be
processed by C functions such as ``strcpy()`` and sent through protocols that
can't handle zero bytes.
diff --git a/Doc/library/logging.config.rst b/Doc/library/logging.config.rst
index b4c9bc3..794cd22 100644
--- a/Doc/library/logging.config.rst
+++ b/Doc/library/logging.config.rst
@@ -144,7 +144,7 @@ in :mod:`logging` itself) and defining handlers which are declared either in
(perhaps if decryption were performed).
To send a configuration to the socket, read in the configuration file and
- send it to the socket as a string of bytes preceded by a four-byte length
+ send it to the socket as a sequence of bytes preceded by a four-byte length
string packed in binary using ``struct.pack('>L', n)``.
.. note::
diff --git a/Doc/library/sunau.rst b/Doc/library/sunau.rst
index d0fd0a3..1ecc7a7 100644
--- a/Doc/library/sunau.rst
+++ b/Doc/library/sunau.rst
@@ -158,7 +158,7 @@ AU_read objects, as returned by :func:`.open` above, have the following methods:
.. method:: AU_read.readframes(n)
- Reads and returns at most *n* frames of audio, as a string of bytes. The data
+ Reads and returns at most *n* frames of audio, as a :class:`bytes` object. The data
will be returned in linear format. If the original data is in u-LAW format, it
will be converted.
diff --git a/Doc/library/wave.rst b/Doc/library/wave.rst
index 7144379..a9b3205 100644
--- a/Doc/library/wave.rst
+++ b/Doc/library/wave.rst
@@ -112,7 +112,7 @@ Wave_read objects, as returned by :func:`.open`, have the following methods:
.. method:: Wave_read.readframes(n)
- Reads and returns at most *n* frames of audio, as a string of bytes.
+ Reads and returns at most *n* frames of audio, as a :class:`bytes` object.
.. method:: Wave_read.rewind()