[Python-checkins] r84229 - in python/branches/py3k: Doc/library/codecs.rst Lib/encodings/aliases.py Misc/NEWS

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Aug 21 04:54:44 2010
New Revision: 84229

Log:
alias macintosh to mac_roman #843590

Modified:
   python/branches/py3k/Doc/library/codecs.rst
   python/branches/py3k/Lib/encodings/aliases.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Doc/library/codecs.rst
==============================================================================
--- python/branches/py3k/Doc/library/codecs.rst	(original)
+++ python/branches/py3k/Doc/library/codecs.rst	Sat Aug 21 04:54:44 2010
@@ -1090,7 +1090,7 @@
 +-----------------+--------------------------------+--------------------------------+
 | mac_latin2      | maclatin2, maccentraleurope    | Central and Eastern Europe     |
 +-----------------+--------------------------------+--------------------------------+
-| mac_roman       | macroman                       | Western Europe                 |
+| mac_roman       | macroman, macintosh            | Western Europe                 |
 +-----------------+--------------------------------+--------------------------------+
 | mac_turkish     | macturkish                     | Turkish                        |
 +-----------------+--------------------------------+--------------------------------+

Modified: python/branches/py3k/Lib/encodings/aliases.py
==============================================================================
--- python/branches/py3k/Lib/encodings/aliases.py	(original)
+++ python/branches/py3k/Lib/encodings/aliases.py	Sat Aug 21 04:54:44 2010
@@ -435,6 +435,7 @@
     'maclatin2'          : 'mac_latin2',
 
     # mac_roman codec
+    'macintosh'          : 'macintosh',
     'macroman'           : 'mac_roman',
 
     # mac_turkish codec

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Aug 21 04:54:44 2010
@@ -117,6 +117,8 @@
 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.