diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-08-10 07:00:33 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-08-10 07:00:33 (GMT) |
| commit | 83545f1c76076f52a6d6797c3ee059748edc5a25 (patch) | |
| tree | da8b97c286b7a3f9784095b49d54e37169a7aafe /Lib | |
| parent | 306c3dd6f5984894ced8f8cc1145b42606233c40 (diff) | |
| parent | 540f0451d282181449ae42b9325764a690bd6162 (diff) | |
| download | cpython-83545f1c76076f52a6d6797c3ee059748edc5a25.zip cpython-83545f1c76076f52a6d6797c3ee059748edc5a25.tar.gz cpython-83545f1c76076f52a6d6797c3ee059748edc5a25.tar.bz2 | |
Merge ISO-8859 fixes from 3.5
Diffstat (limited to 'Lib')
| -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 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Lib/email/base64mime.py b/Lib/email/base64mime.py index f3bbac1..17f0818 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 c1fe2b4..c543eb5 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 af3fb85..8a7e06e 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 |