From: R David Murray Date: Wed, 24 Aug 2016 00:43:56 +0000 (-0400) Subject: #25916: fix a few 'string of bytes' references. X-Git-Tag: v3.6.0b1~570^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48de28290ca1f71ddaa04553997e53c8fcf7e14e;p=thirdparty%2FPython%2Fcpython.git #25916: fix a few 'string of bytes' references. Patch by SilengGhost. --- diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst index fbeb11aac9ab..a48ae1f5faba 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 b4c9bc3dc10f..794cd22e5b07 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 d0fd0a3cc7f8..1ecc7a7cf92b 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 714437978486..a9b3205322d7 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()