upstream/oracle/userland-gate: components/python/python26/patches/Python26-12-encoding-alias.patch@87e11e685b1f

7003927 userland should postprocess packaged files 7034188 userland should have common lint library rules 7034992 userland packages should include opensolaris.arc_url data 7019309 move ghostscript to userland (fix build)


diff --git Python-2.6.4/Lib/encodings/aliases.py Python-2.6.4/Lib/encodings/aliases.py
--- Python-2.6.4/Lib/encodings/aliases.py
+++ Python-2.6.4/Lib/encodings/aliases.py
@@ -73,6 +73,7 @@
 
     # cp1251 codec
     '1251'               : 'cp1251',
+    'ansi_1251'          : 'cp1251',
     'windows_1251'       : 'cp1251',
 
     # cp1252 codec
@@ -217,6 +218,7 @@
     'u_jis'              : 'euc_jp',
 
     # euc_kr codec
+    '5601'               : 'euc_kr',
     'euckr'              : 'euc_kr',
     'korean'             : 'euc_kr',
     'ksc5601'            : 'euc_kr',
@@ -457,6 +459,7 @@
     'shiftjis'           : 'shift_jis',
     'sjis'               : 'shift_jis',
     's_jis'              : 'shift_jis',
+    'pck'                : 'shift_jis',
 
     # shift_jis_2004 codec
     'shiftjis2004'       : 'shift_jis_2004',
@@ -476,6 +479,7 @@
     'tis_620_0'          : 'tis_620',
     'tis_620_2529_0'     : 'tis_620',
     'tis_620_2529_1'     : 'tis_620',
+    'tis620.2533'        : 'tis_620',
     'iso_ir_166'         : 'tis_620',
 
     # utf_16 codec

author	Norm Jacobs <Norm.Jacobs@Oracle.COM>
	Wed, 13 Apr 2011 09:58:06 -0700
changeset 181	87e11e685b1f
parent 115	c360825c3a3f
permissions	-rw-r--r--