diff options
| -rw-r--r-- | Doc/library/http.client.rst | 4 | ||||
| -rw-r--r-- | Lib/email/base64mime.py | 2 | ||||
| -rw-r--r-- | Lib/email/quoprimime.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_email/test_email.py | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst index 8954648976..a9ca4b0d0f 100644 --- a/Doc/library/http.client.rst +++ b/Doc/library/http.client.rst @@ -227,12 +227,12 @@ HTTPConnection Objects If *body* is specified, the specified data is sent after the headers are finished. It may be a string, a :term:`bytes-like object`, an open :term:`file object`, or an iterable of :term:`bytes-like object`\s. If - *body* is a string, it is encoded as ISO-8851-1, the default for HTTP. If + *body* is a string, it is encoded as ISO-8859-1, the default for HTTP. If it is a bytes-like object the bytes are sent as is. If it is a :term:`file object`, the contents of the file is sent; this file object should support at least the ``read()`` method. If the file object has a ``mode`` attribute, the data returned by the ``read()`` method will be encoded as - ISO-8851-1 unless the ``mode`` attribute contains the substring ``b``, + ISO-8859-1 unless the ``mode`` attribute contains the substring ``b``, otherwise the data returned by ``read()`` is sent as is. If *body* is an iterable, the elements of the iterable are sent as is until the iterable is exhausted. diff --git a/Lib/email/base64mime.py b/Lib/email/base64mime.py index f3bbac1caf..17f0818f6c 100644 --- a/Lib/email/base64mime.py +++ b/Lib/email/base64mime.py @@ -103,7 +103,7 @@ def decode(string): """Decode a raw base64 string, returning a bytes object. This function does not parse a full MIME header value encoded with - base64 (like =?iso-8895-1?b?bmloISBuaWgh?=) -- please use the high + base64 (like =?iso-8859-1?b?bmloISBuaWgh?=) -- please use the high level email.header class for that functionality. """ if not string: diff --git a/Lib/email/quoprimime.py b/Lib/email/quoprimime.py index c1fe2b4694..c543eb59ae 100644 --- a/Lib/email/quoprimime.py +++ b/Lib/email/quoprimime.py @@ -292,7 +292,7 @@ def header_decode(s): """Decode a string encoded with RFC 2045 MIME header `Q' encoding. This function does not parse a full MIME header value encoded with - quoted-printable (like =?iso-8895-1?q?Hello_World?=) -- please use + quoted-printable (like =?iso-8859-1?q?Hello_World?=) -- please use the high level email.header class for that functionality. """ s = s.replace('_', ' ') diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py index af3fb85c56..8a7e06e4ad 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -2302,9 +2302,9 @@ Re: =?mac-iceland?q?r=8Aksm=9Arg=8Cs?= baz foo bar =?mac-iceland?q?r=8Aksm?= def test_rfc2047_Q_invalid_digits(self): # issue 10004. - s = '=?iso-8659-1?Q?andr=e9=zz?=' + s = '=?iso-8859-1?Q?andr=e9=zz?=' self.assertEqual(decode_header(s), - [(b'andr\xe9=zz', 'iso-8659-1')]) + [(b'andr\xe9=zz', 'iso-8859-1')]) def test_rfc2047_rfc2047_1(self): # 1st testcase at end of rfc2047 |