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
........
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 @@
'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 42d1d46..96b9f7d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@
Core and Builtins
-----------------
+- Issue #1757126: Fix the cyrillic-asian alias for the ptcp154 encoding.
+
- Issue #6970: Remove redundant calls when comparing objects that don't
implement the relevant rich comparison methods.