Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/python/python27/patches/08-encoding-alias.patch
author John Beck <John.Beck@Oracle.COM>
Mon, 06 Oct 2014 13:15:36 -0700
branchs11u2-sru
changeset 3379 e99da14b537a
parent 458 2edc011b559e
permissions -rw-r--r--
PSARC 2014/183 Python 2.7.6 18251953 update Python 2.7 line to version 2.7.6 19004605 update Python 2.7 line to version 2.7.7 19308541 update Python 2.7 line to version 2.7.8 19284990 python 2.7.7 segfaults while under memory stress 17431625 64-bit python should use long rather than int for os.sysconf() return value 19164544 Python 2.7 test_tcl fails 19030238 Python 2.7 test_sysconfig fails - no module named _osx_support 19030198 Python 2.7 tests fail - import name error 19032456 more Python 2.7 tests failing with import errors 19022543 Python 2.7 test_lib2to3 fails
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3379
e99da14b537a PSARC 2014/183 Python 2.7.6
John Beck <John.Beck@Oracle.COM>
parents: 458
diff changeset 
     1
 
Add missing encoding aliases.  It may be contributed upstream at some point,
e99da14b537a PSARC 2014/183 Python 2.7.6
John Beck <John.Beck@Oracle.COM>
parents: 458
diff changeset 
     2
 
but the suitability (or lack thereof) has not yet been determined.
e99da14b537a PSARC 2014/183 Python 2.7.6
John Beck <John.Beck@Oracle.COM>
parents: 458
diff changeset 
     3
 












e99da14b537a
PSARC 2014/183 Python 2.7.6



John Beck <John.Beck@Oracle.COM>


parents: 
458

diff
changeset




     4


--- Python-2.7.6/Lib/encodings/aliases.py.~1~	2013-11-09 23:36:40.000000000 -0800













e99da14b537a
PSARC 2014/183 Python 2.7.6



John Beck <John.Beck@Oracle.COM>


parents: 
458

diff
changeset




     5


+++ Python-2.7.6/Lib/encodings/aliases.py	2014-05-14 13:12:20.046910463 -0700








458






2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




     6


@@ -73,6 +73,7 @@













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




     7


 













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




     8


     # cp1251 codec













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




     9


     '1251'               : 'cp1251',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    10


+    'ansi_1251'          : 'cp1251',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    11


     'windows_1251'       : 'cp1251',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    12


 













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    13


     # cp1252 codec








3379






e99da14b537a
PSARC 2014/183 Python 2.7.6



John Beck <John.Beck@Oracle.COM>


parents: 
458

diff
changeset




    14


@@ -222,6 +223,7 @@








458






2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    15


     'u_jis'              : 'euc_jp',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    16


 













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    17


     # euc_kr codec













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    18


+    '5601'               : 'euc_kr',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    19


     'euckr'              : 'euc_kr',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    20


     'korean'             : 'euc_kr',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    21


     'ksc5601'            : 'euc_kr',








3379






e99da14b537a
PSARC 2014/183 Python 2.7.6



John Beck <John.Beck@Oracle.COM>


parents: 
458

diff
changeset




    22


@@ -462,6 +464,7 @@








458






2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    23


     'shiftjis'           : 'shift_jis',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    24


     'sjis'               : 'shift_jis',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    25


     's_jis'              : 'shift_jis',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    26


+    'pck'                : 'shift_jis',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    27


 













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    28


     # shift_jis_2004 codec













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    29


     'shiftjis2004'       : 'shift_jis_2004',








3379






e99da14b537a
PSARC 2014/183 Python 2.7.6



John Beck <John.Beck@Oracle.COM>


parents: 
458

diff
changeset




    30


@@ -481,6 +484,7 @@








458






2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    31


     'tis_620_0'          : 'tis_620',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    32


     'tis_620_2529_0'     : 'tis_620',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    33


     'tis_620_2529_1'     : 'tis_620',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    34


+    'tis620.2533'        : 'tis_620',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    35


     'iso_ir_166'         : 'tis_620',













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    36


 













2edc011b559e
7004671 Add Python 2.7.1



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 

diff
changeset




    37


     # utf_16 codec















upstream/oracle/userland-gate