summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Jenvey <pjenvey@underboss.org>2009-11-17 02:42:26 (GMT)
committerPhilip Jenvey <pjenvey@underboss.org>2009-11-17 02:42:26 (GMT)
commitfab8be2f99889a21c0651c7e7ac0d7ffa91a872c (patch)
tree0eb668e0f93faa27586c1a7f25e00f303e406e28
parent3d6790e49fb0267dbc8550b76411cdda412bf0e8 (diff)
downloadcpython-fab8be2f99889a21c0651c7e7ac0d7ffa91a872c.zip
cpython-fab8be2f99889a21c0651c7e7ac0d7ffa91a872c.tar.gz
cpython-fab8be2f99889a21c0651c7e7ac0d7ffa91a872c.tar.bz2
#1757126: fix typo with the cyrillic_asian alias
-rw-r--r--Lib/encodings/aliases.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/encodings/aliases.py b/Lib/encodings/aliases.py
index c6f5aeb..992eef4 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',
diff --git a/Misc/NEWS b/Misc/NEWS
index 041f2a7..d366818 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.7 alpha 1
Core and Builtins
-----------------
+- Issue #1757126: Fix the cyrillic-asian alias for the ptcp154 encoding.
+
- Fix several issues with compile(). The input can now contain Windows and Mac
newlines and is no longer required to end in a newline.