summaryrefslogtreecommitdiffstats
path: root/Lib/encodings
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-08-21 02:54:44 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-08-21 02:54:44 (GMT)
commit23110e7361fb6238556913173311f042ccd87099 (patch)
treeb4e3c2423b492f69e66f2de5352a0dc587b813b9 /Lib/encodings
parent0cc7444ea9870c11b6ce0c61e4c761609f295f69 (diff)
downloadcpython-23110e7361fb6238556913173311f042ccd87099.zip
cpython-23110e7361fb6238556913173311f042ccd87099.tar.gz
cpython-23110e7361fb6238556913173311f042ccd87099.tar.bz2
alias macintosh to mac_roman #843590
Diffstat (limited to 'Lib/encodings')
-rw-r--r--Lib/encodings/aliases.py1
1 files changed, 1 insertions, 0 deletions
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