Bring CJKCodecs 1.1 into trunk. This completely reorganizes source · pythoncapi/cpython@2bb146f · GitHub
Skip to content

Commit 2bb146f

Browse files
hyeshikhyeshik
committed
Bring CJKCodecs 1.1 into trunk. This completely reorganizes source
and installed layouts to make maintenance simple and easy. And it also adds four new codecs; big5hkscs, euc-jis-2004, shift-jis-2004 and iso2022-jp-2004.
1 parent 264c659 commit 2bb146f

109 files changed

Lines changed: 34437 additions & 40345 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Doc/lib/libcodecs.tex‎

Lines changed: 17 additions & 1 deletion

‎Lib/encodings/aliases.py‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
'big5_tw' : 'big5',
4040
'csbig5' : 'big5',
4141

42+
# big5hkscs codec
43+
'big5_hkscs' : 'big5hkscs',
44+
'hkscs' : 'big5hkscs',
45+
4246
# bz2_codec codec
4347
'bz2' : 'bz2_codec',
4448

@@ -197,8 +201,12 @@
197201
'950' : 'cp950',
198202
'ms950' : 'cp950',
199203

204+
# euc_jis_2004 codec
205+
'jisx0213' : 'euc_jis_2004',
206+
'eucjis2004' : 'euc_jis_2004',
207+
'euc_jis2004' : 'euc_jis_2004',
208+
200209
# euc_jisx0213 codec
201-
'jisx0213' : 'euc_jisx0213',
202210
'eucjisx0213' : 'euc_jisx0213',
203211

204212
# euc_jp codec
@@ -254,6 +262,10 @@
254262
'iso2022jp_2' : 'iso2022_jp_2',
255263
'iso_2022_jp_2' : 'iso2022_jp_2',
256264

265+
# iso2022_jp_2004 codec
266+
'iso_2022_jp_2004' : 'iso2022_jp_2004',
267+
'iso2022jp_2004' : 'iso2022_jp_2004',
268+
257269
# iso2022_jp_3 codec
258270
'iso2022jp_3' : 'iso2022_jp_3',
259271
'iso_2022_jp_3' : 'iso2022_jp_3',
@@ -416,6 +428,11 @@
416428
'sjis' : 'shift_jis',
417429
's_jis' : 'shift_jis',
418430

431+
# shift_jis_2004 codec
432+
'shiftjis2004' : 'shift_jis_2004',
433+
'sjis_2004' : 'shift_jis_2004',
434+
's_jis_2004' : 'shift_jis_2004',
435+
419436
# shift_jisx0213 codec
420437
'shiftjisx0213' : 'shift_jisx0213',
421438
'sjisx0213' : 'shift_jisx0213',

‎Lib/encodings/big5.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
# big5.py: Python Unicode Codec for BIG5
33
#
44
# Written by Hye-Shik Chang <perky@FreeBSD.org>
5-
# $CJKCodecs: big5.py,v 1.3 2004/01/17 11:26:10 perky Exp $
5+
# $CJKCodecs: big5.py,v 1.8 2004/06/28 18:16:03 perky Exp $
66
#
77

8-
from _codecs_big5 import codec
9-
import codecs
8+
import _codecs_tw, codecs
9+
10+
codec = _codecs_tw.getcodec('big5')
1011

1112
class Codec(codecs.Codec):
1213
encode = codec.encode
@@ -30,4 +31,4 @@ def __init__(self, stream, errors='strict'):
3031
self.reset = __codec.reset
3132

3233
def getregentry():
33-
return (Codec().encode,Codec().decode,StreamReader,StreamWriter)
34+
return (codec.encode, codec.decode, StreamReader, StreamWriter)

‎Lib/encodings/big5hkscs.py‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#
2+
# big5hkscs.py: Python Unicode Codec for BIG5HKSCS
3+
#
4+
# Written by Hye-Shik Chang <perky@FreeBSD.org>
5+
# $CJKCodecs: big5hkscs.py,v 1.1 2004/06/29 05:14:27 perky Exp $
6+
#
7+
8+
import _codecs_hk, codecs
9+
10+
codec = _codecs_hk.getcodec('big5hkscs')
11+
12+
class Codec(codecs.Codec):
13+
encode = codec.encode
14+
decode = codec.decode
15+
16+
class StreamReader(Codec, codecs.StreamReader):
17+
def __init__(self, stream, errors='strict'):
18+
codecs.StreamReader.__init__(self, stream, errors)
19+
__codec = codec.StreamReader(stream, errors)
20+
self.read = __codec.read
21+
self.readline = __codec.readline
22+
self.readlines = __codec.readlines
23+
self.reset = __codec.reset
24+
25+
class StreamWriter(Codec, codecs.StreamWriter):
26+
def __init__(self, stream, errors='strict'):
27+
codecs.StreamWriter.__init__(self, stream, errors)
28+
__codec = codec.StreamWriter(stream, errors)
29+
self.write = __codec.write
30+
self.writelines = __codec.writelines
31+
self.reset = __codec.reset
32+
33+
def getregentry():
34+
return (codec.encode, codec.decode, StreamReader, StreamWriter)

‎Lib/encodings/cp932.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
# cp932.py: Python Unicode Codec for CP932
33
#
44
# Written by Hye-Shik Chang <perky@FreeBSD.org>
5-
# $CJKCodecs: cp932.py,v 1.3 2004/01/17 11:26:10 perky Exp $
5+
# $CJKCodecs: cp932.py,v 1.8 2004/06/28 18:16:03 perky Exp $
66
#
77

8-
from _codecs_cp932 import codec
9-
import codecs
8+
import _codecs_jp, codecs
9+
10+
codec = _codecs_jp.getcodec('cp932')
1011

1112
class Codec(codecs.Codec):
1213
encode = codec.encode
@@ -30,4 +31,4 @@ def __init__(self, stream, errors='strict'):
3031
self.reset = __codec.reset
3132

3233
def getregentry():
33-
return (Codec().encode,Codec().decode,StreamReader,StreamWriter)
34+
return (codec.encode, codec.decode, StreamReader, StreamWriter)

‎Lib/encodings/cp949.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
# cp949.py: Python Unicode Codec for CP949
33
#
44
# Written by Hye-Shik Chang <perky@FreeBSD.org>
5-
# $CJKCodecs: cp949.py,v 1.3 2004/01/17 11:26:10 perky Exp $
5+
# $CJKCodecs: cp949.py,v 1.8 2004/06/28 18:16:03 perky Exp $
66
#
77

8-
from _codecs_cp949 import codec
9-
import codecs
8+
import _codecs_kr, codecs
9+
10+
codec = _codecs_kr.getcodec('cp949')
1011

1112
class Codec(codecs.Codec):
1213
encode = codec.encode
@@ -30,4 +31,4 @@ def __init__(self, stream, errors='strict'):
3031
self.reset = __codec.reset
3132

3233
def getregentry():
33-
return (Codec().encode,Codec().decode,StreamReader,StreamWriter)
34+
return (codec.encode, codec.decode, StreamReader, StreamWriter)

‎Lib/encodings/cp950.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
# cp950.py: Python Unicode Codec for CP950
33
#
44
# Written by Hye-Shik Chang <perky@FreeBSD.org>
5-
# $CJKCodecs: cp950.py,v 1.3 2004/01/17 11:26:10 perky Exp $
5+
# $CJKCodecs: cp950.py,v 1.8 2004/06/28 18:16:03 perky Exp $
66
#
77

8-
from _codecs_cp950 import codec
9-
import codecs
8+
import _codecs_tw, codecs
9+
10+
codec = _codecs_tw.getcodec('cp950')
1011

1112
class Codec(codecs.Codec):
1213
encode = codec.encode
@@ -30,4 +31,4 @@ def __init__(self, stream, errors='strict'):
3031
self.reset = __codec.reset
3132

3233
def getregentry():
33-
return (Codec().encode,Codec().decode,StreamReader,StreamWriter)
34+
return (codec.encode, codec.decode, StreamReader, StreamWriter)

‎Lib/encodings/euc_jis_2004.py‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#
2+
# euc_jis_2004.py: Python Unicode Codec for EUC_JIS_2004
3+
#
4+
# Written by Hye-Shik Chang <perky@FreeBSD.org>
5+
# $CJKCodecs: euc_jis_2004.py,v 1.1 2004/07/07 16:18:25 perky Exp $
6+
#
7+
8+
import _codecs_jp, codecs
9+
10+
codec = _codecs_jp.getcodec('euc_jis_2004')
11+
12+
class Codec(codecs.Codec):
13+
encode = codec.encode
14+
decode = codec.decode
15+
16+
class StreamReader(Codec, codecs.StreamReader):
17+
def __init__(self, stream, errors='strict'):
18+
codecs.StreamReader.__init__(self, stream, errors)
19+
__codec = codec.StreamReader(stream, errors)
20+
self.read = __codec.read
21+
self.readline = __codec.readline
22+
self.readlines = __codec.readlines
23+
self.reset = __codec.reset
24+
25+
class StreamWriter(Codec, codecs.StreamWriter):
26+
def __init__(self, stream, errors='strict'):
27+
codecs.StreamWriter.__init__(self, stream, errors)
28+
__codec = codec.StreamWriter(stream, errors)
29+
self.write = __codec.write
30+
self.writelines = __codec.writelines
31+
self.reset = __codec.reset
32+
33+
def getregentry():
34+
return (codec.encode, codec.decode, StreamReader, StreamWriter)

‎Lib/encodings/euc_jisx0213.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
# euc_jisx0213.py: Python Unicode Codec for EUC_JISX0213
33
#
44
# Written by Hye-Shik Chang <perky@FreeBSD.org>
5-
# $CJKCodecs: euc_jisx0213.py,v 1.3 2004/01/17 11:26:10 perky Exp $
5+
# $CJKCodecs: euc_jisx0213.py,v 1.8 2004/06/28 18:16:03 perky Exp $
66
#
77

8-
from _codecs_euc_jisx0213 import codec
9-
import codecs
8+
import _codecs_jp, codecs
9+
10+
codec = _codecs_jp.getcodec('euc_jisx0213')
1011

1112
class Codec(codecs.Codec):
1213
encode = codec.encode
@@ -30,4 +31,4 @@ def __init__(self, stream, errors='strict'):
3031
self.reset = __codec.reset
3132

3233
def getregentry():
33-
return (Codec().encode,Codec().decode,StreamReader,StreamWriter)
34+
return (codec.encode, codec.decode, StreamReader, StreamWriter)

‎Lib/encodings/euc_jp.py‎

Lines changed: 5 additions & 4 deletions

0 commit comments

Comments
 (0)