[Python-checkins] r76338 - in python/branches/py3k: Lib/encodings/aliases.py Misc/NEWS

philip.jenvey python-checkins at python.org
Tue Nov 17 04:43:15 CET 2009


Author: philip.jenvey
Date: Tue Nov 17 04:43:14 2009
New Revision: 76338

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/encodings/aliases.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Lib/encodings/aliases.py
==============================================================================
--- python/branches/py3k/Lib/encodings/aliases.py	(original)
+++ python/branches/py3k/Lib/encodings/aliases.py	Tue Nov 17 04:43:14 2009
@@ -442,7 +442,7 @@
     'csptcp154'          : 'ptcp154',
     'pt154'              : 'ptcp154',
     'cp154'              : 'ptcp154',
-    'cyrillic-asian'     : 'ptcp154',
+    'cyrillic_asian'     : 'ptcp154',
 
     ## quopri_codec codec
     #'quopri'             : 'quopri_codec',

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Tue Nov 17 04:43:14 2009
@@ -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.
 


More information about the Python-checkins mailing list