traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

alias macintosh to mac_roman #843590

This commit is contained in:
Benjamin Peterson 2010-08-21 02:54:44 +00:00
parent 0cc7444ea9
commit 23110e7361
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/library/codecs.rst
View File

@ -1090,7 +1090,7 @@ particular, the following variants typically exist:
+-----------------+--------------------------------+--------------------------------+ +-----------------+--------------------------------+--------------------------------+
| mac_latin2 | maclatin2, maccentraleurope | Central and Eastern Europe | | mac_latin2 | maclatin2, maccentraleurope | Central and Eastern Europe |
+-----------------+--------------------------------+--------------------------------+ +-----------------+--------------------------------+--------------------------------+
| mac_roman | macroman | Western Europe | | mac_roman | macroman, macintosh | Western Europe |
+-----------------+--------------------------------+--------------------------------+ +-----------------+--------------------------------+--------------------------------+
| mac_turkish | macturkish | Turkish | | mac_turkish | macturkish | Turkish |
+-----------------+--------------------------------+--------------------------------+ +-----------------+--------------------------------+--------------------------------+

1
Lib/encodings/aliases.py
View File

@ -435,6 +435,7 @@ aliases = {
'maclatin2' : 'mac_latin2', 'maclatin2' : 'mac_latin2',
# mac_roman codec # mac_roman codec
'macintosh' : 'macintosh',
'macroman' : 'mac_roman', 'macroman' : 'mac_roman',
# mac_turkish codec # mac_turkish codec

2
Misc/NEWS
View File

@ -117,6 +117,8 @@ Extensions
Library Library
------- -------
- Issue #843590: Make "macintosh" an alias to the "mac_roman" encoding.
- Create os.fsdecode(): decode from the filesystem encoding with - Create os.fsdecode(): decode from the filesystem encoding with
surrogateescape error handler, or strict error handler on Windows. surrogateescape error handler, or strict error handler on Windows.