components/python/python27/patches/08-encoding-alias.patch
branchs11u2-sru
changeset 3379 e99da14b537a
parent 458 2edc011b559e
equal deleted inserted replaced
3375:3724eda7445e 3379:e99da14b537a
     1 diff --git Python-2.6.4/Lib/encodings/aliases.py Python-2.6.4/Lib/encodings/aliases.py
     1 Add missing encoding aliases.  It may be contributed upstream at some point,
     2 --- Python-2.6.4/Lib/encodings/aliases.py
     2 but the suitability (or lack thereof) has not yet been determined.
     3 +++ Python-2.6.4/Lib/encodings/aliases.py
     3 
       
     4 --- Python-2.7.6/Lib/encodings/aliases.py.~1~	2013-11-09 23:36:40.000000000 -0800
       
     5 +++ Python-2.7.6/Lib/encodings/aliases.py	2014-05-14 13:12:20.046910463 -0700
     4 @@ -73,6 +73,7 @@
     6 @@ -73,6 +73,7 @@
     5  
     7  
     6      # cp1251 codec
     8      # cp1251 codec
     7      '1251'               : 'cp1251',
     9      '1251'               : 'cp1251',
     8 +    'ansi_1251'          : 'cp1251',
    10 +    'ansi_1251'          : 'cp1251',
     9      'windows_1251'       : 'cp1251',
    11      'windows_1251'       : 'cp1251',
    10  
    12  
    11      # cp1252 codec
    13      # cp1252 codec
    12 @@ -217,6 +218,7 @@
    14 @@ -222,6 +223,7 @@
    13      'u_jis'              : 'euc_jp',
    15      'u_jis'              : 'euc_jp',
    14  
    16  
    15      # euc_kr codec
    17      # euc_kr codec
    16 +    '5601'               : 'euc_kr',
    18 +    '5601'               : 'euc_kr',
    17      'euckr'              : 'euc_kr',
    19      'euckr'              : 'euc_kr',
    18      'korean'             : 'euc_kr',
    20      'korean'             : 'euc_kr',
    19      'ksc5601'            : 'euc_kr',
    21      'ksc5601'            : 'euc_kr',
    20 @@ -457,6 +459,7 @@
    22 @@ -462,6 +464,7 @@
    21      'shiftjis'           : 'shift_jis',
    23      'shiftjis'           : 'shift_jis',
    22      'sjis'               : 'shift_jis',
    24      'sjis'               : 'shift_jis',
    23      's_jis'              : 'shift_jis',
    25      's_jis'              : 'shift_jis',
    24 +    'pck'                : 'shift_jis',
    26 +    'pck'                : 'shift_jis',
    25  
    27  
    26      # shift_jis_2004 codec
    28      # shift_jis_2004 codec
    27      'shiftjis2004'       : 'shift_jis_2004',
    29      'shiftjis2004'       : 'shift_jis_2004',
    28 @@ -476,6 +479,7 @@
    30 @@ -481,6 +484,7 @@
    29      'tis_620_0'          : 'tis_620',
    31      'tis_620_0'          : 'tis_620',
    30      'tis_620_2529_0'     : 'tis_620',
    32      'tis_620_2529_0'     : 'tis_620',
    31      'tis_620_2529_1'     : 'tis_620',
    33      'tis_620_2529_1'     : 'tis_620',
    32 +    'tis620.2533'        : 'tis_620',
    34 +    'tis620.2533'        : 'tis_620',
    33      'iso_ir_166'         : 'tis_620',
    35      'iso_ir_166'         : 'tis_620',