From: Philip Jenvey <pjenvey@underboss.org>
Date: Tue, 17 Nov 2009 02:42:26 +0000 (+0000)
Subject: #1757126: fix typo with the cyrillic_asian alias
X-Git-Tag: v2.7a1~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fab8be2f99889a21c0651c7e7ac0d7ffa91a872c;p=thirdparty%2FPython%2Fcpython.git

#1757126: fix typo with the cyrillic_asian alias
---

diff --git a/Lib/encodings/aliases.py b/Lib/encodings/aliases.py
index c6f5aeb506ca..992eef4bcdd3 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 041f2a77236d..d3668183da8a 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.