From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 21 Aug 2010 02:54:44 +0000 (+0000)
Subject: alias macintosh to mac_roman #843590
X-Git-Tag: v3.2a2~189
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23110e7361fb6238556913173311f042ccd87099;p=thirdparty%2FPython%2Fcpython.git

alias macintosh to mac_roman #843590
---

diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index 31e04244ba1c..e734fee0b107 100644
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -1090,7 +1090,7 @@ particular, the following variants typically exist:
 +-----------------+--------------------------------+--------------------------------+
 | mac_latin2      | maclatin2, maccentraleurope    | Central and Eastern Europe     |
 +-----------------+--------------------------------+--------------------------------+
-| mac_roman       | macroman                       | Western Europe                 |
+| mac_roman       | macroman, macintosh            | Western Europe                 |
 +-----------------+--------------------------------+--------------------------------+
 | mac_turkish     | macturkish                     | Turkish                        |
 +-----------------+--------------------------------+--------------------------------+
diff --git a/Lib/encodings/aliases.py b/Lib/encodings/aliases.py
index 9461e5f65e9a..a8c48df27a98 100644
--- a/Lib/encodings/aliases.py
+++ b/Lib/encodings/aliases.py
@@ -435,6 +435,7 @@ aliases = {
     'maclatin2'          : 'mac_latin2',
 
     # mac_roman codec
+    'macintosh'          : 'macintosh',
     'macroman'           : 'mac_roman',
 
     # mac_turkish codec
diff --git a/Misc/NEWS b/Misc/NEWS
index 3512e8624c7b..019cd4b9dafb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -117,6 +117,8 @@ Extensions
 Library
 -------
 
+- Issue #843590: Make "macintosh" an alias to the "mac_roman" encoding.
+
 - Create os.fsdecode(): decode from the filesystem encoding with
   surrogateescape error handler, or strict error handler on Windows.