diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-08-21 02:54:44 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-08-21 02:54:44 (GMT) |
| commit | 23110e7361fb6238556913173311f042ccd87099 (patch) | |
| tree | b4e3c2423b492f69e66f2de5352a0dc587b813b9 | |
| parent | 0cc7444ea9870c11b6ce0c61e4c761609f295f69 (diff) | |
| download | cpython-23110e7361fb6238556913173311f042ccd87099.zip cpython-23110e7361fb6238556913173311f042ccd87099.tar.gz cpython-23110e7361fb6238556913173311f042ccd87099.tar.bz2 | |
alias macintosh to mac_roman #843590
| -rw-r--r-- | Doc/library/codecs.rst | 2 | ||||
| -rw-r--r-- | Lib/encodings/aliases.py | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index 31e0424..e734fee 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 9461e5f..a8c48df 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 @@ -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. |