From 1309adb06ae49d941190c7b2502203b1128fac00 Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Tue, 17 Nov 2009 03:43:14 +0000
Subject: 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
........
---
Lib/encodings/aliases.py | 2 +-
Misc/NEWS | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
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',
diff --git a/Misc/NEWS b/Misc/NEWS
index 42d1d46..96b9f7d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 3.2 Alpha 1?
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.
--
cgit v0.12