summaryrefslogtreecommitdiffstats
path: root/Lib/encodings
diff options
context:
space:
mode:
authorPhilip Jenvey <pjenvey@underboss.org>2009-11-17 03:43:14 (GMT)
committerPhilip Jenvey <pjenvey@underboss.org>2009-11-17 03:43:14 (GMT)
commit1309adb06ae49d941190c7b2502203b1128fac00 (patch)
treeb21971b87f658d9b2990f9df713c2ebb0280a17f /Lib/encodings
parent06bf4994d7c6be6303967cab7a75dc7e729aa3da (diff)
downloadcpython-1309adb06ae49d941190c7b2502203b1128fac00.zip
cpython-1309adb06ae49d941190c7b2502203b1128fac00.tar.gz
cpython-1309adb06ae49d941190c7b2502203b1128fac00.tar.bz2
Merged revisions 76337 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r76337 | philip.jenvey | 2009-11-16 18:42:26 -0800 (Mon, 16 Nov 2009) | 2 lines #1757126: fix typo with the cyrillic_asian alias ........
Diffstat (limited to 'Lib/encodings')
-rw-r--r--Lib/encodings/aliases.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/encodings/aliases.py b/Lib/encodings/aliases.py
index 4c35588..dcdca30 100644
--- a/Lib/encodings/aliases.py
+++ b/Lib/encodings/aliases.py
@@ -442,7 +442,7 @@ aliases = {
'csptcp154' : 'ptcp154',
'pt154' : 'ptcp154',
'cp154' : 'ptcp154',
- 'cyrillic-asian' : 'ptcp154',
+ 'cyrillic_asian' : 'ptcp154',
## quopri_codec codec
#'quopri' : 'quopri_codec',