Update of /cvsroot/python/python/dist/src/Lib/encodings
In directory usw-pr-cvs1:/tmp/cvs-serv22095/Lib/encodings
Modified Files:
aliases.py
Log Message:
Adapt lookup names to new more general encoding name normalization
scheme.
Index: aliases.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/encodings/aliases.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** aliases.py 26 Sep 2002 20:08:23 -0000 1.15
--- aliases.py 4 Oct 2002 11:51:39 -0000 1.16
***************
*** 33,37 ****
'ibm367' : 'ascii',
'iso646_us' : 'ascii',
! 'iso_646.irv:1991' : 'ascii',
'iso_ir_6' : 'ascii',
'us' : 'ascii',
--- 33,37 ----
'ibm367' : 'ascii',
'iso646_us' : 'ascii',
! 'iso_646.irv_1991' : 'ascii',
'iso_ir_6' : 'ascii',
'us' : 'ascii',
***************
*** 172,176 ****
'csisolatin6' : 'iso8859_10',
'iso_8859_10' : 'iso8859_10',
! 'iso_8859_10:1992' : 'iso8859_10',
'iso_ir_157' : 'iso8859_10',
'l6' : 'iso8859_10',
--- 172,176 ----
'csisolatin6' : 'iso8859_10',
'iso_8859_10' : 'iso8859_10',
! 'iso_8859_10_1992' : 'iso8859_10',
'iso_ir_157' : 'iso8859_10',
'l6' : 'iso8859_10',
***************
*** 182,186 ****
# iso8859_14 codec
'iso_8859_14' : 'iso8859_14',
! 'iso_8859_14:1998' : 'iso8859_14',
'iso_celtic' : 'iso8859_14',
'iso_ir_199' : 'iso8859_14',
--- 182,186 ----
# iso8859_14 codec
'iso_8859_14' : 'iso8859_14',
! 'iso_8859_14_1998' : 'iso8859_14',
'iso_celtic' : 'iso8859_14',
'iso_ir_199' : 'iso8859_14',
***************
*** 194,198 ****
'csisolatin2' : 'iso8859_2',
'iso_8859_2' : 'iso8859_2',
! 'iso_8859_2:1987' : 'iso8859_2',
'iso_ir_101' : 'iso8859_2',
'l2' : 'iso8859_2',
--- 194,198 ----
'csisolatin2' : 'iso8859_2',
'iso_8859_2' : 'iso8859_2',
! 'iso_8859_2_1987' : 'iso8859_2',
'iso_ir_101' : 'iso8859_2',
'l2' : 'iso8859_2',
***************
*** 202,206 ****
'csisolatin3' : 'iso8859_3',
'iso_8859_3' : 'iso8859_3',
! 'iso_8859_3:1988' : 'iso8859_3',
'iso_ir_109' : 'iso8859_3',
'l3' : 'iso8859_3',
--- 202,206 ----
'csisolatin3' : 'iso8859_3',
'iso_8859_3' : 'iso8859_3',
! 'iso_8859_3_1988' : 'iso8859_3',
'iso_ir_109' : 'iso8859_3',
'l3' : 'iso8859_3',
***************
*** 210,214 ****
'csisolatin4' : 'iso8859_4',
'iso_8859_4' : 'iso8859_4',
! 'iso_8859_4:1988' : 'iso8859_4',
'iso_ir_110' : 'iso8859_4',
'l4' : 'iso8859_4',
--- 210,214 ----
'csisolatin4' : 'iso8859_4',
'iso_8859_4' : 'iso8859_4',
! 'iso_8859_4_1988' : 'iso8859_4',
'iso_ir_110' : 'iso8859_4',
'l4' : 'iso8859_4',
***************
*** 219,223 ****
'cyrillic' : 'iso8859_5',
'iso_8859_5' : 'iso8859_5',
! 'iso_8859_5:1988' : 'iso8859_5',
'iso_ir_144' : 'iso8859_5',
--- 219,223 ----
'cyrillic' : 'iso8859_5',
'iso_8859_5' : 'iso8859_5',
! 'iso_8859_5_1988' : 'iso8859_5',
'iso_ir_144' : 'iso8859_5',
***************
*** 228,232 ****
'ecma_114' : 'iso8859_6',
'iso_8859_6' : 'iso8859_6',
! 'iso_8859_6:1987' : 'iso8859_6',
'iso_ir_127' : 'iso8859_6',
--- 228,232 ----
'ecma_114' : 'iso8859_6',
'iso_8859_6' : 'iso8859_6',
! 'iso_8859_6_1987' : 'iso8859_6',
'iso_ir_127' : 'iso8859_6',
***************
*** 238,242 ****
'greek8' : 'iso8859_7',
'iso_8859_7' : 'iso8859_7',
! 'iso_8859_7:1987' : 'iso8859_7',
'iso_ir_126' : 'iso8859_7',
--- 238,242 ----
'greek8' : 'iso8859_7',
'iso_8859_7' : 'iso8859_7',
! 'iso_8859_7_1987' : 'iso8859_7',
'iso_ir_126' : 'iso8859_7',
***************
*** 245,249 ****
'hebrew' : 'iso8859_8',
'iso_8859_8' : 'iso8859_8',
! 'iso_8859_8:1988' : 'iso8859_8',
'iso_ir_138' : 'iso8859_8',
--- 245,249 ----
'hebrew' : 'iso8859_8',
'iso_8859_8' : 'iso8859_8',
! 'iso_8859_8_1988' : 'iso8859_8',
'iso_ir_138' : 'iso8859_8',
***************
*** 251,255 ****
'csisolatin5' : 'iso8859_9',
'iso_8859_9' : 'iso8859_9',
! 'iso_8859_9:1989' : 'iso8859_9',
'iso_ir_148' : 'iso8859_9',
'l5' : 'iso8859_9',
--- 251,255 ----
'csisolatin5' : 'iso8859_9',
'iso_8859_9' : 'iso8859_9',
! 'iso_8859_9_1989' : 'iso8859_9',
'iso_ir_148' : 'iso8859_9',
'l5' : 'iso8859_9',
***************
*** 270,274 ****
'iso8859' : 'latin_1',
'iso_8859_1' : 'latin_1',
! 'iso_8859_1:1987' : 'latin_1',
'iso_ir_100' : 'latin_1',
'l1' : 'latin_1',
--- 270,274 ----
'iso8859' : 'latin_1',
'iso_8859_1' : 'latin_1',
! 'iso_8859_1_1987' : 'latin_1',
'iso_ir_100' : 'latin_1',
'l1' : 'latin_1',
***************
*** 329,334 ****
'utf' : 'utf_8',
'utf8' : 'utf_8',
! 'utf8@ucs2' : 'utf_8',
! 'utf8@ucs4' : 'utf_8',
# uu_codec codec
--- 329,334 ----
'utf' : 'utf_8',
'utf8' : 'utf_8',
! 'utf8_ucs2' : 'utf_8',
! 'utf8_ucs4' : 'utf_8',
# uu_codec codec
In directory usw-pr-cvs1:/tmp/cvs-serv22095/Lib/encodings
Modified Files:
aliases.py
Log Message:
Adapt lookup names to new more general encoding name normalization
scheme.
Index: aliases.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/encodings/aliases.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** aliases.py 26 Sep 2002 20:08:23 -0000 1.15
--- aliases.py 4 Oct 2002 11:51:39 -0000 1.16
***************
*** 33,37 ****
'ibm367' : 'ascii',
'iso646_us' : 'ascii',
! 'iso_646.irv:1991' : 'ascii',
'iso_ir_6' : 'ascii',
'us' : 'ascii',
--- 33,37 ----
'ibm367' : 'ascii',
'iso646_us' : 'ascii',
! 'iso_646.irv_1991' : 'ascii',
'iso_ir_6' : 'ascii',
'us' : 'ascii',
***************
*** 172,176 ****
'csisolatin6' : 'iso8859_10',
'iso_8859_10' : 'iso8859_10',
! 'iso_8859_10:1992' : 'iso8859_10',
'iso_ir_157' : 'iso8859_10',
'l6' : 'iso8859_10',
--- 172,176 ----
'csisolatin6' : 'iso8859_10',
'iso_8859_10' : 'iso8859_10',
! 'iso_8859_10_1992' : 'iso8859_10',
'iso_ir_157' : 'iso8859_10',
'l6' : 'iso8859_10',
***************
*** 182,186 ****
# iso8859_14 codec
'iso_8859_14' : 'iso8859_14',
! 'iso_8859_14:1998' : 'iso8859_14',
'iso_celtic' : 'iso8859_14',
'iso_ir_199' : 'iso8859_14',
--- 182,186 ----
# iso8859_14 codec
'iso_8859_14' : 'iso8859_14',
! 'iso_8859_14_1998' : 'iso8859_14',
'iso_celtic' : 'iso8859_14',
'iso_ir_199' : 'iso8859_14',
***************
*** 194,198 ****
'csisolatin2' : 'iso8859_2',
'iso_8859_2' : 'iso8859_2',
! 'iso_8859_2:1987' : 'iso8859_2',
'iso_ir_101' : 'iso8859_2',
'l2' : 'iso8859_2',
--- 194,198 ----
'csisolatin2' : 'iso8859_2',
'iso_8859_2' : 'iso8859_2',
! 'iso_8859_2_1987' : 'iso8859_2',
'iso_ir_101' : 'iso8859_2',
'l2' : 'iso8859_2',
***************
*** 202,206 ****
'csisolatin3' : 'iso8859_3',
'iso_8859_3' : 'iso8859_3',
! 'iso_8859_3:1988' : 'iso8859_3',
'iso_ir_109' : 'iso8859_3',
'l3' : 'iso8859_3',
--- 202,206 ----
'csisolatin3' : 'iso8859_3',
'iso_8859_3' : 'iso8859_3',
! 'iso_8859_3_1988' : 'iso8859_3',
'iso_ir_109' : 'iso8859_3',
'l3' : 'iso8859_3',
***************
*** 210,214 ****
'csisolatin4' : 'iso8859_4',
'iso_8859_4' : 'iso8859_4',
! 'iso_8859_4:1988' : 'iso8859_4',
'iso_ir_110' : 'iso8859_4',
'l4' : 'iso8859_4',
--- 210,214 ----
'csisolatin4' : 'iso8859_4',
'iso_8859_4' : 'iso8859_4',
! 'iso_8859_4_1988' : 'iso8859_4',
'iso_ir_110' : 'iso8859_4',
'l4' : 'iso8859_4',
***************
*** 219,223 ****
'cyrillic' : 'iso8859_5',
'iso_8859_5' : 'iso8859_5',
! 'iso_8859_5:1988' : 'iso8859_5',
'iso_ir_144' : 'iso8859_5',
--- 219,223 ----
'cyrillic' : 'iso8859_5',
'iso_8859_5' : 'iso8859_5',
! 'iso_8859_5_1988' : 'iso8859_5',
'iso_ir_144' : 'iso8859_5',
***************
*** 228,232 ****
'ecma_114' : 'iso8859_6',
'iso_8859_6' : 'iso8859_6',
! 'iso_8859_6:1987' : 'iso8859_6',
'iso_ir_127' : 'iso8859_6',
--- 228,232 ----
'ecma_114' : 'iso8859_6',
'iso_8859_6' : 'iso8859_6',
! 'iso_8859_6_1987' : 'iso8859_6',
'iso_ir_127' : 'iso8859_6',
***************
*** 238,242 ****
'greek8' : 'iso8859_7',
'iso_8859_7' : 'iso8859_7',
! 'iso_8859_7:1987' : 'iso8859_7',
'iso_ir_126' : 'iso8859_7',
--- 238,242 ----
'greek8' : 'iso8859_7',
'iso_8859_7' : 'iso8859_7',
! 'iso_8859_7_1987' : 'iso8859_7',
'iso_ir_126' : 'iso8859_7',
***************
*** 245,249 ****
'hebrew' : 'iso8859_8',
'iso_8859_8' : 'iso8859_8',
! 'iso_8859_8:1988' : 'iso8859_8',
'iso_ir_138' : 'iso8859_8',
--- 245,249 ----
'hebrew' : 'iso8859_8',
'iso_8859_8' : 'iso8859_8',
! 'iso_8859_8_1988' : 'iso8859_8',
'iso_ir_138' : 'iso8859_8',
***************
*** 251,255 ****
'csisolatin5' : 'iso8859_9',
'iso_8859_9' : 'iso8859_9',
! 'iso_8859_9:1989' : 'iso8859_9',
'iso_ir_148' : 'iso8859_9',
'l5' : 'iso8859_9',
--- 251,255 ----
'csisolatin5' : 'iso8859_9',
'iso_8859_9' : 'iso8859_9',
! 'iso_8859_9_1989' : 'iso8859_9',
'iso_ir_148' : 'iso8859_9',
'l5' : 'iso8859_9',
***************
*** 270,274 ****
'iso8859' : 'latin_1',
'iso_8859_1' : 'latin_1',
! 'iso_8859_1:1987' : 'latin_1',
'iso_ir_100' : 'latin_1',
'l1' : 'latin_1',
--- 270,274 ----
'iso8859' : 'latin_1',
'iso_8859_1' : 'latin_1',
! 'iso_8859_1_1987' : 'latin_1',
'iso_ir_100' : 'latin_1',
'l1' : 'latin_1',
***************
*** 329,334 ****
'utf' : 'utf_8',
'utf8' : 'utf_8',
! 'utf8@ucs2' : 'utf_8',
! 'utf8@ucs4' : 'utf_8',
# uu_codec codec
--- 329,334 ----
'utf' : 'utf_8',
'utf8' : 'utf_8',
! 'utf8_ucs2' : 'utf_8',
! 'utf8_ucs4' : 'utf_8',
# uu_codec codec