From: Martin Panter <vadmium+py@gmail.com>
Date: Wed, 10 Aug 2016 05:25:16 +0000 (+0000)
Subject: Correct misspellings of ISO-8859
X-Git-Tag: v2.7.13rc1~223
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c715b0897dc660ccc0303b59e904897aa07e0f2;p=python

Correct misspellings of ISO-8859
---

diff --git a/Lib/email/base64mime.py b/Lib/email/base64mime.py
index 4aa800026d..61eba2bec1 100644
--- a/Lib/email/base64mime.py
+++ b/Lib/email/base64mime.py
@@ -166,7 +166,7 @@ def decode(s, convert_eols=None):
     decoding a text attachment.
 
     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 s:
diff --git a/Lib/email/quoprimime.py b/Lib/email/quoprimime.py
index 0c18a9e04e..cd818eb768 100644
--- a/Lib/email/quoprimime.py
+++ b/Lib/email/quoprimime.py
@@ -329,7 +329,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/email/test/test_email.py b/Lib/email/test/test_email.py
index 160306c5ee..b6be2a2ed0 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -1673,9 +1673,9 @@ class TestRFC2047(unittest.TestCase):
 
     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')])
 
 
 # Test the MIMEMessage class