koco-cvs Mailing List for Python Korean Codecs (Page 8)
Brought to you by:
perky
Menu
▾
▴
koco-cvs — CVS Check-ins
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(88) |
May
(5) |
Jun
|
Jul
(27) |
Aug
|
Sep
|
Oct
(5) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(77) |
Feb
(3) |
Mar
|
Apr
(22) |
May
(123) |
Jun
(80) |
Jul
(83) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-29 07:22:38
|
perky 03/05/29 00:22:38
Modified: cjkcodecs Makefile aliases.py
Added: cjkcodecs johab.py
Log:
Add 'johab' codec.
Revision Changes Path
1.4 +2 -2 cjkcodecs/cjkcodecs/Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 28 May 2003 09:18:12 -0000 1.3
+++ Makefile 29 May 2003 07:22:37 -0000 1.4
@@ -25,13 +25,13 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: Makefile,v 1.3 2003/05/28 09:18:12 perky Exp $
+# $Id: Makefile,v 1.4 2003/05/29 07:22:37 perky Exp $
#
GENERIC_ENCODINGS= gb2312 gbk gb18030 hz \
big5 cp950 \
cp932 shift_jis euc_jp \
- cp949 euc_kr
+ cp949 euc_kr johab
all:
for cset in ${GENERIC_ENCODINGS}; do \
1.4 +6 -1 cjkcodecs/cjkcodecs/aliases.py
Index: aliases.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/aliases.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aliases.py 28 May 2003 09:18:12 -0000 1.3
+++ aliases.py 29 May 2003 07:22:38 -0000 1.4
@@ -26,7 +26,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: aliases.py,v 1.3 2003/05/28 09:18:12 perky Exp $
+# $Id: aliases.py,v 1.4 2003/05/29 07:22:38 perky Exp $
#
from encodings.aliases import aliases
@@ -95,6 +95,11 @@
'hzgb' : 'cjkcodecs.hz',
'hz_gb' : 'cjkcodecs.hz',
'hz_gb_2312' : 'cjkcodecs.hz',
+
+ # johab codec
+ 'johab' : 'cjkcodecs.johab',
+ 'cp1361' : 'cjkcodecs.johab',
+ 'ms1361' : 'cjkcodecs.johab',
# shift_jis codec
'csshiftjis' : 'cjkcodecs.shift_jis',
1.1 cjkcodecs/cjkcodecs/johab.py
Index: johab.py
===================================================================
# ACHTUNG: This file is generated automatically. Please do not edit.
#
# johab.py: Python Unicode Codec for JOHAB
#
# Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# $Id: johab.py,v 1.1 2003/05/29 07:22:38 perky Exp $
#
from cjkcodecs._johab import codec
import codecs
class Codec(codecs.Codec):
encode = codec.encode
decode = codec.decode
class StreamReader(Codec, codecs.StreamReader):
def __init__(self, stream, errors='strict'):
codecs.StreamReader.__init__(self, stream, errors)
__codec = codec.StreamReader(stream, errors)
self.read = __codec.read
self.readline = __codec.readline
self.readlines = __codec.readlines
self.reset = __codec.reset
class StreamWriter(Codec, codecs.StreamWriter):
def __init__(self, stream, errors='strict'):
codecs.StreamWriter.__init__(self, stream, errors)
__codec = codec.StreamWriter(stream, errors)
self.write = __codec.write
self.writelines = __codec.writelines
self.reset = __codec.reset
def getregentry():
return (Codec().encode,Codec().decode,StreamReader,StreamWriter)
# ex: ts=8 sts=4 et
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-29 07:22:38
|
perky 03/05/29 00:22:37
Modified: . setup.py
Log:
Add 'johab' codec.
Revision Changes Path
1.15 +2 -2 cjkcodecs/setup.py
Index: setup.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/setup.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- setup.py 28 May 2003 09:18:14 -0000 1.14
+++ setup.py 29 May 2003 07:22:37 -0000 1.15
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: setup.py,v 1.14 2003/05/28 09:18:14 perky Exp $
+# $Id: setup.py,v 1.15 2003/05/29 07:22:37 perky Exp $
#
import sys
@@ -37,7 +37,7 @@
extensions = []
encodings = {
'ja_JP': ['shift_jis', 'cp932', 'euc_jp'],
-'ko_KR': ['euc_kr', 'cp949'],
+'ko_KR': ['euc_kr', 'cp949', 'johab'],
'zh_CN': ['gb2312', 'gbk', 'gb18030', 'hz'],
'zh_TW': ['big5', 'cp950']
}
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-28 09:18:16
|
perky 03/05/28 02:18:14
Added: src _hz.c
Log:
Add 'hz' codec.
Revision Changes Path
1.1 cjkcodecs/src/_hz.c
Index: _hz.c
===================================================================
/*
* _hz.c: the HZ codec (RFC1843)
*
* Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* $Id: _hz.c,v 1.1 2003/05/28 09:18:14 perky Exp $
*/
#include "codeccommon.h"
ENCMAP(gbcommon)
DECMAP(gb2312)
ENCODER(hz)
{
while (inleft > 0) {
Py_UNICODE c = **inbuf;
DBCHAR code;
if (c < 0x80) {
if (state->i == 0) {
RESERVE_OUTBUF(1)
**outbuf = c;
NEXT(1, 1)
} else {
RESERVE_OUTBUF(3)
(*outbuf)[0] = '~';
(*outbuf)[1] = '}';
(*outbuf)[2] = (unsigned char)c;
NEXT(1, 3)
state->i = 0;
}
continue;
}
UCS4INVALID(c)
TRYMAP_ENC(gbcommon, code, c);
else return 1;
if (code & 0x8000) /* MSB set: GBK */
return 1;
if (state->i == 0) {
RESERVE_OUTBUF(4)
(*outbuf)[0] = '~';
(*outbuf)[1] = '{';
(*outbuf)[2] = code >> 8;
(*outbuf)[3] = code & 0xFF;
NEXT(1, 4)
state->i = 1;
} else {
RESERVE_OUTBUF(2)
(*outbuf)[0] = code >> 8;
(*outbuf)[1] = code & 0xFF;
NEXT(1, 2)
}
}
return 0;
}
DECODER(hz)
{
while (inleft > 0) {
unsigned char c = **inbuf;
if (c == '~') {
unsigned char c2 = (*inbuf)[1];
RESERVE_INBUF(2)
if (c2 == '~') {
RESERVE_OUTBUF(1)
**outbuf = '~';
NEXT(2, 1)
continue;
} else if (c2 == '{' && state->i == 0)
state->i = 1; /* set GB */
else if (c2 == '}' && state->i == 1)
state->i = 0; /* set ASCII */
else if (c2 == '\n')
; /* line-continuation */
else
return 2;
NEXT(2, 0);
continue;
}
if (c & 0x80)
return 1;
if (state->i == 0) { /* ASCII mode */
RESERVE_OUTBUF(1)
**outbuf = c;
NEXT(1, 1)
} else { /* GB mode */
RESERVE_INBUF(2)
TRYMAP_DEC(gb2312, **outbuf, c, (*inbuf)[1]) {
RESERVE_OUTBUF(1)
NEXT(2, 1)
} else
return 2;
}
}
return 0;
}
BEGIN_CODEC_REGISTRY(hz)
MAPOPEN(zh_CN)
IMPORTMAP_DEC(gb2312)
IMPORTMAP_ENC(gbcommon)
MAPCLOSE()
END_CODEC_REGISTRY(hz)
/*
* ex: ts=8 sts=4 et
*/
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-28 09:18:15
|
perky 03/05/28 02:18:14
Modified: . setup.py
Log:
Add 'hz' codec.
Revision Changes Path
1.14 +2 -2 cjkcodecs/setup.py
Index: setup.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/setup.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- setup.py 26 May 2003 07:57:51 -0000 1.13
+++ setup.py 28 May 2003 09:18:14 -0000 1.14
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: setup.py,v 1.13 2003/05/26 07:57:51 perky Exp $
+# $Id: setup.py,v 1.14 2003/05/28 09:18:14 perky Exp $
#
import sys
@@ -38,7 +38,7 @@
encodings = {
'ja_JP': ['shift_jis', 'cp932', 'euc_jp'],
'ko_KR': ['euc_kr', 'cp949'],
-'zh_CN': ['gb2312', 'gbk', 'gb18030'],
+'zh_CN': ['gb2312', 'gbk', 'gb18030', 'hz'],
'zh_TW': ['big5', 'cp950']
}
locales = ['ja_JP', 'ko_KR', 'zh_CN', 'zh_TW']
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-28 09:18:14
|
perky 03/05/28 02:18:13
Modified: cjkcodecs Makefile aliases.py
Added: cjkcodecs hz.py
Log:
Add 'hz' codec.
Revision Changes Path
1.3 +2 -2 cjkcodecs/cjkcodecs/Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 26 May 2003 15:28:27 -0000 1.2
+++ Makefile 28 May 2003 09:18:12 -0000 1.3
@@ -25,10 +25,10 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: Makefile,v 1.2 2003/05/26 15:28:27 perky Exp $
+# $Id: Makefile,v 1.3 2003/05/28 09:18:12 perky Exp $
#
-GENERIC_ENCODINGS= gb2312 gbk gb18030 \
+GENERIC_ENCODINGS= gb2312 gbk gb18030 hz \
big5 cp950 \
cp932 shift_jis euc_jp \
cp949 euc_kr
1.3 +7 -1 cjkcodecs/cjkcodecs/aliases.py
Index: aliases.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/aliases.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aliases.py 26 May 2003 15:31:51 -0000 1.2
+++ aliases.py 28 May 2003 09:18:12 -0000 1.3
@@ -26,7 +26,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: aliases.py,v 1.2 2003/05/26 15:31:51 perky Exp $
+# $Id: aliases.py,v 1.3 2003/05/28 09:18:12 perky Exp $
#
from encodings.aliases import aliases
@@ -89,6 +89,12 @@
'cp936' : 'cjkcodecs.gbk',
'gbk' : 'cjkcodecs.gbk',
'ms936' : 'cjkcodecs.gbk',
+
+ # hz codec
+ 'hz' : 'cjkcodecs.hz',
+ 'hzgb' : 'cjkcodecs.hz',
+ 'hz_gb' : 'cjkcodecs.hz',
+ 'hz_gb_2312' : 'cjkcodecs.hz',
# shift_jis codec
'csshiftjis' : 'cjkcodecs.shift_jis',
1.1 cjkcodecs/cjkcodecs/hz.py
Index: hz.py
===================================================================
# ACHTUNG: This file is generated automatically. Please do not edit.
#
# hz.py: Python Unicode Codec for HZ
#
# Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# $Id: hz.py,v 1.1 2003/05/28 09:18:12 perky Exp $
#
from cjkcodecs._hz import codec
import codecs
class Codec(codecs.Codec):
encode = codec.encode
decode = codec.decode
class StreamReader(Codec, codecs.StreamReader):
def __init__(self, stream, errors='strict'):
codecs.StreamReader.__init__(self, stream, errors)
__codec = codec.StreamReader(stream, errors)
self.read = __codec.read
self.readline = __codec.readline
self.readlines = __codec.readlines
self.reset = __codec.reset
class StreamWriter(Codec, codecs.StreamWriter):
def __init__(self, stream, errors='strict'):
codecs.StreamWriter.__init__(self, stream, errors)
__codec = codec.StreamWriter(stream, errors)
self.write = __codec.write
self.writelines = __codec.writelines
self.reset = __codec.reset
def getregentry():
return (Codec().encode,Codec().decode,StreamReader,StreamWriter)
# ex: ts=8 sts=4 et
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-28 08:10:30
|
perky 03/05/28 00:48:16
Added: tests test_encoding_gb18030.py test_encoding_gb2312.py
test_encoding_gbk.py test_mapping_gb2312.py
test_mapping_gbk.py
Log:
Add unittests for chinese encodings.
Revision Changes Path
1.1 cjkcodecs/tests/test_encoding_gb18030.py
Index: test_encoding_gb18030.py
===================================================================
#!/usr/bin/env python
#
# test_encoding_gb18030.py: Encoding test for the GB18030 codec
#
# Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# $Id: test_encoding_gb18030.py,v 1.1 2003/05/28 07:48:14 perky Exp $
#
from test import test_support
import test_multibytecodec_support
import unittest
class Test_GB18030(test_multibytecodec_support.TestBase, unittest.TestCase):
encoding = 'gb18030'
tstring = test_multibytecodec_support.load_teststring('gb18030')
errortests = (
# invalid bytes
("abc\x80\x80\xc1\xc4", "strict", None),
("abc\xc8", "strict", None),
("abc\x80\x80\xc1\xc4", "replace", u"abc\ufffd\u804a"),
("abc\x80\x80\xc1\xc4\xc8", "replace", u"abc\ufffd\u804a\ufffd"),
("abc\x80\x80\xc1\xc4", "ignore", u"abc\u804a"),
("abc\x84\x39\x84\x39\xc1\xc4", "replace", u"abc\ufffd\u804a"),
)
has_iso10646 = True
def test_main():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(Test_GB18030))
test_support.run_suite(suite)
if __name__ == "__main__":
test_main()
# ex: ts=8 sts=4 et
1.1 cjkcodecs/tests/test_encoding_gb2312.py
Index: test_encoding_gb2312.py
===================================================================
#!/usr/bin/env python
#
# test_encoding_gb2312.py: Encoding test for the GB2312 codec
#
# Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# $Id: test_encoding_gb2312.py,v 1.1 2003/05/28 07:48:15 perky Exp $
#
from test import test_support
import test_multibytecodec_support
import unittest
class Test_GB2312(test_multibytecodec_support.TestBase, unittest.TestCase):
encoding = 'gb2312'
tstring = test_multibytecodec_support.load_teststring('gb2312')
errortests = (
# invalid bytes
("abc\x81\x81\xc1\xc4", "strict", None),
("abc\xc8", "strict", None),
("abc\x81\x81\xc1\xc4", "replace", u"abc\ufffd\u804a"),
("abc\x81\x81\xc1\xc4\xc8", "replace", u"abc\ufffd\u804a\ufffd"),
("abc\x81\x81\xc1\xc4", "ignore", u"abc\u804a"),
("\xc1\x64", "strict", None),
)
def test_main():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(Test_GB2312))
test_support.run_suite(suite)
if __name__ == "__main__":
test_main()
# ex: ts=8 sts=4 et
1.1 cjkcodecs/tests/test_encoding_gbk.py
Index: test_encoding_gbk.py
===================================================================
#!/usr/bin/env python
#
# test_encoding_gbk.py: Encoding test for the GBK codec
#
# Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# $Id: test_encoding_gbk.py,v 1.1 2003/05/28 07:48:15 perky Exp $
#
from test import test_support
import test_multibytecodec_support
import unittest
class Test_GBK(test_multibytecodec_support.TestBase, unittest.TestCase):
encoding = 'gbk'
tstring = test_multibytecodec_support.load_teststring('gbk')
errortests = (
# invalid bytes
("abc\x80\x80\xc1\xc4", "strict", None),
("abc\xc8", "strict", None),
("abc\x80\x80\xc1\xc4", "replace", u"abc\ufffd\u804a"),
("abc\x80\x80\xc1\xc4\xc8", "replace", u"abc\ufffd\u804a\ufffd"),
("abc\x80\x80\xc1\xc4", "ignore", u"abc\u804a"),
("\x83\x34\x83\x31", "strict", None),
)
def test_main():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(Test_GBK))
test_support.run_suite(suite)
if __name__ == "__main__":
test_main()
# ex: ts=8 sts=4 et
1.1 cjkcodecs/tests/test_mapping_gb2312.py
Index: test_mapping_gb2312.py
===================================================================
#!/usr/bin/env python
#
# test_mapping_gb2312.py: Mapping test for gb2312 codec
#
# Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# $Id: test_mapping_gb2312.py,v 1.1 2003/05/28 07:48:15 perky Exp $
#
from test import test_support
import test_multibytecodec_support
import sys, codecs, os
import unittest
class TestGB2312Map(test_multibytecodec_support.TestBase_Mapping,
unittest.TestCase):
encoding = 'gb2312'
mapfilename = 'EUC-CN.TXT'
def test_main():
if not os.path.exists('EUC-CN.TXT'):
raise test_support.TestSkipped(
'EUC-CN.TXT not found, download from http://people.freebsd'
'.org/~perky/i18n/EUC-CN.TXT')
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestGB2312Map))
test_support.run_suite(suite)
if __name__ == "__main__":
test_main()
# ex: ts=8 sts=4 et
1.1 cjkcodecs/tests/test_mapping_gbk.py
Index: test_mapping_gbk.py
===================================================================
#!/usr/bin/env python
#
# test_encoding_gbk.py: Encoding test for the GBK codec
#
# Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# $Id: test_mapping_gbk.py,v 1.1 2003/05/28 07:48:15 perky Exp $
#
from test import test_support
import test_multibytecodec_support
import sys, codecs, os
import unittest
class TestGBKMap(test_multibytecodec_support.TestBase_Mapping,
unittest.TestCase):
encoding = 'gbk'
mapfilename = 'CP936.TXT'
def test_main():
if not os.path.exists('CP936.TXT'):
raise test_support.TestSkipped(
'CP936.TXT not found, download from http://www.unicode.'
'org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP936.TXT')
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestGBKMap))
test_support.run_suite(suite)
if __name__ == "__main__":
test_main()
# ex: ts=8 sts=4 et
|
perky 03/05/28 01:02:08
Modified: tests test_mapping_cp932.py test_mapping_cp949.py
test_mapping_cp950.py test_mapping_euc_jp.py
test_mapping_euc_kr.py test_mapping_gb2312.py
test_mapping_gbk.py test_mapping_shift_jis.py
testall.py
Log:
Collect all test suits and run at once.
Revision Changes Path
1.2 +6 -6 cjkcodecs/tests/test_mapping_cp932.py
Index: test_mapping_cp932.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tests/test_mapping_cp932.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test_mapping_cp932.py 26 May 2003 11:10:50 -0000 1.1
+++ test_mapping_cp932.py 28 May 2003 08:02:06 -0000 1.2
@@ -27,24 +27,24 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: test_mapping_cp932.py,v 1.1 2003/05/26 11:10:50 perky Exp $
+# $Id: test_mapping_cp932.py,v 1.2 2003/05/28 08:02:06 perky Exp $
#
from test import test_support
import test_multibytecodec_support
import os, unittest
+if not os.path.exists('CP932.TXT'):
+ raise test_support.TestSkipped(
+ 'CP932.TXT not found, download from http://www.unicode.'
+ 'org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT')
+
class TestCP932Map(test_multibytecodec_support.TestBase_Mapping,
unittest.TestCase):
encoding = 'cp932'
mapfilename = 'CP932.TXT'
def test_main():
- if not os.path.exists('CP932.TXT'):
- raise test_support.TestSkipped(
- 'CP932.TXT not found, download from http://www.unicode.'
- 'org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT')
-
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestCP932Map))
test_support.run_suite(suite)
1.2 +6 -6 cjkcodecs/tests/test_mapping_cp949.py
Index: test_mapping_cp949.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tests/test_mapping_cp949.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test_mapping_cp949.py 27 May 2003 05:17:48 -0000 1.1
+++ test_mapping_cp949.py 28 May 2003 08:02:06 -0000 1.2
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: test_mapping_cp949.py,v 1.1 2003/05/27 05:17:48 perky Exp $
+# $Id: test_mapping_cp949.py,v 1.2 2003/05/28 08:02:06 perky Exp $
#
from test import test_support
@@ -35,16 +35,16 @@
import sys, codecs, os
import unittest
+if not os.path.exists('CP949.TXT'):
+ raise test_support.TestSkipped(
+ 'CP949.TXT not found, download from http://www.unicode.'
+ 'org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP949.TXT')
+
class TestCP949Map(test_multibytecodec_support.TestBase_Mapping, unittest.TestCase):
encoding = 'cp949'
mapfilename = 'CP949.TXT'
def test_main():
- if not os.path.exists('CP949.TXT'):
- raise test_support.TestSkipped(
- 'CP949.TXT not found, download from http://www.unicode.'
- 'org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP949.TXT')
-
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestCP949Map))
test_support.run_suite(suite)
1.2 +6 -6 cjkcodecs/tests/test_mapping_cp950.py
Index: test_mapping_cp950.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tests/test_mapping_cp950.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test_mapping_cp950.py 28 May 2003 07:01:35 -0000 1.1
+++ test_mapping_cp950.py 28 May 2003 08:02:06 -0000 1.2
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: test_mapping_cp950.py,v 1.1 2003/05/28 07:01:35 perky Exp $
+# $Id: test_mapping_cp950.py,v 1.2 2003/05/28 08:02:06 perky Exp $
#
from test import test_support
@@ -35,17 +35,17 @@
import sys, codecs, os
import unittest
+if not os.path.exists('CP950.TXT'):
+ raise test_support.TestSkipped(
+ 'CP950.TXT not found, download from http://www.unicode.'
+ 'org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP950.TXT')
+
class TestCP950Map(test_multibytecodec_support.TestBase_Mapping,
unittest.TestCase):
encoding = 'cp950'
mapfilename = 'CP950.TXT'
def test_main():
- if not os.path.exists('CP950.TXT'):
- raise test_support.TestSkipped(
- 'CP950.TXT not found, download from http://www.unicode.'
- 'org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP950.TXT')
-
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestCP950Map))
test_support.run_suite(suite)
1.2 +6 -6 cjkcodecs/tests/test_mapping_euc_jp.py
Index: test_mapping_euc_jp.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tests/test_mapping_euc_jp.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test_mapping_euc_jp.py 26 May 2003 11:10:50 -0000 1.1
+++ test_mapping_euc_jp.py 28 May 2003 08:02:06 -0000 1.2
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: test_mapping_euc_jp.py,v 1.1 2003/05/26 11:10:50 perky Exp $
+# $Id: test_mapping_euc_jp.py,v 1.2 2003/05/28 08:02:06 perky Exp $
#
from test import test_support
@@ -35,17 +35,17 @@
import sys, codecs, os
import unittest
+if not os.path.exists('EUC-JP.TXT'):
+ raise test_support.TestSkipped(
+ 'EUC-JP.TXT not found, download from http://people.freebsd'
+ '.org/~perky/i18n/EUC-JP.TXT')
+
class TestEUCJPMap(test_multibytecodec_support.TestBase_Mapping,
unittest.TestCase):
encoding = 'euc_jp'
mapfilename = 'EUC-JP.TXT'
def test_main():
- if not os.path.exists('EUC-JP.TXT'):
- raise test_support.TestSkipped(
- 'EUC-JP.TXT not found, download from http://people.freebsd'
- '.org/~perky/i18n/EUC-JP.TXT')
-
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestEUCJPMap))
test_support.run_suite(suite)
1.2 +6 -6 cjkcodecs/tests/test_mapping_euc_kr.py
Index: test_mapping_euc_kr.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tests/test_mapping_euc_kr.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test_mapping_euc_kr.py 27 May 2003 06:49:42 -0000 1.1
+++ test_mapping_euc_kr.py 28 May 2003 08:02:06 -0000 1.2
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: test_mapping_euc_kr.py,v 1.1 2003/05/27 06:49:42 perky Exp $
+# $Id: test_mapping_euc_kr.py,v 1.2 2003/05/28 08:02:06 perky Exp $
#
from test import test_support
@@ -35,17 +35,17 @@
import sys, codecs, os
import unittest
+if not os.path.exists('EUC-KR.TXT'):
+ raise test_support.TestSkipped(
+ 'EUC-KR.TXT not found, download from http://people.freebsd'
+ '.org/~perky/i18n/EUC-KR.TXT')
+
class TestEUCKRMap(test_multibytecodec_support.TestBase_Mapping,
unittest.TestCase):
encoding = 'euc_kr'
mapfilename = 'EUC-KR.TXT'
def test_main():
- if not os.path.exists('EUC-KR.TXT'):
- raise test_support.TestSkipped(
- 'EUC-KR.TXT not found, download from http://people.freebsd'
- '.org/~perky/i18n/EUC-KR.TXT')
-
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestEUCKRMap))
test_support.run_suite(suite)
1.2 +6 -6 cjkcodecs/tests/test_mapping_gb2312.py
Index: test_mapping_gb2312.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tests/test_mapping_gb2312.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test_mapping_gb2312.py 28 May 2003 07:48:15 -0000 1.1
+++ test_mapping_gb2312.py 28 May 2003 08:02:06 -0000 1.2
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: test_mapping_gb2312.py,v 1.1 2003/05/28 07:48:15 perky Exp $
+# $Id: test_mapping_gb2312.py,v 1.2 2003/05/28 08:02:06 perky Exp $
#
from test import test_support
@@ -35,17 +35,17 @@
import sys, codecs, os
import unittest
+if not os.path.exists('EUC-CN.TXT'):
+ raise test_support.TestSkipped(
+ 'EUC-CN.TXT not found, download from http://people.freebsd'
+ '.org/~perky/i18n/EUC-CN.TXT')
+
class TestGB2312Map(test_multibytecodec_support.TestBase_Mapping,
unittest.TestCase):
encoding = 'gb2312'
mapfilename = 'EUC-CN.TXT'
def test_main():
- if not os.path.exists('EUC-CN.TXT'):
- raise test_support.TestSkipped(
- 'EUC-CN.TXT not found, download from http://people.freebsd'
- '.org/~perky/i18n/EUC-CN.TXT')
-
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestGB2312Map))
test_support.run_suite(suite)
1.2 +6 -6 cjkcodecs/tests/test_mapping_gbk.py
Index: test_mapping_gbk.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tests/test_mapping_gbk.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test_mapping_gbk.py 28 May 2003 07:48:15 -0000 1.1
+++ test_mapping_gbk.py 28 May 2003 08:02:07 -0000 1.2
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: test_mapping_gbk.py,v 1.1 2003/05/28 07:48:15 perky Exp $
+# $Id: test_mapping_gbk.py,v 1.2 2003/05/28 08:02:07 perky Exp $
#
from test import test_support
@@ -35,17 +35,17 @@
import sys, codecs, os
import unittest
+if not os.path.exists('CP936.TXT'):
+ raise test_support.TestSkipped(
+ 'CP936.TXT not found, download from http://www.unicode.'
+ 'org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP936.TXT')
+
class TestGBKMap(test_multibytecodec_support.TestBase_Mapping,
unittest.TestCase):
encoding = 'gbk'
mapfilename = 'CP936.TXT'
def test_main():
- if not os.path.exists('CP936.TXT'):
- raise test_support.TestSkipped(
- 'CP936.TXT not found, download from http://www.unicode.'
- 'org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP936.TXT')
-
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestGBKMap))
test_support.run_suite(suite)
1.2 +6 -6 cjkcodecs/tests/test_mapping_shift_jis.py
Index: test_mapping_shift_jis.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tests/test_mapping_shift_jis.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test_mapping_shift_jis.py 26 May 2003 11:10:50 -0000 1.1
+++ test_mapping_shift_jis.py 28 May 2003 08:02:07 -0000 1.2
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: test_mapping_shift_jis.py,v 1.1 2003/05/26 11:10:50 perky Exp $
+# $Id: test_mapping_shift_jis.py,v 1.2 2003/05/28 08:02:07 perky Exp $
#
from test import test_support
@@ -35,17 +35,17 @@
import sys, codecs, os
import unittest
+if not os.path.exists('SHIFTJIS.TXT'):
+ raise test_support.TestSkipped(
+ 'SHIFTJIS.TXT not found, download from http://www.unicode.'
+ 'org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/SHIFTJIS.TXT')
+
class TestSJISMap(test_multibytecodec_support.TestBase_Mapping,
unittest.TestCase):
encoding = 'shift_jis'
mapfilename = 'SHIFTJIS.TXT'
def test_main():
- if not os.path.exists('SHIFTJIS.TXT'):
- raise test_support.TestSkipped(
- 'SHIFTJIS.TXT not found, download from http://www.unicode.'
- 'org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/SHIFTJIS.TXT')
-
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestSJISMap))
test_support.run_suite(suite)
1.2 +10 -4 cjkcodecs/tests/testall.py
Index: testall.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tests/testall.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testall.py 27 May 2003 04:18:23 -0000 1.1
+++ testall.py 28 May 2003 08:02:07 -0000 1.2
@@ -27,11 +27,12 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: testall.py,v 1.1 2003/05/27 04:18:23 perky Exp $
+# $Id: testall.py,v 1.2 2003/05/28 08:02:07 perky Exp $
#
import sys
import os, unittest
+from test import test_support
def findtests(testdir='.'):
tests = []
@@ -41,13 +42,18 @@
tests.append(name[:-3])
return tests
-def runtest(test):
+def loadtests(test):
mod = __import__(test, globals(), locals(), [])
- mod.test_main()
+ return unittest.findTestCases(mod)
def main():
+ suite = unittest.TestSuite()
for test in findtests():
- runtest(test)
+ try:
+ suite.addTest(loadtests(test))
+ except test_support.TestSkipped, msg:
+ print "%s - skipped: %s" % (test, msg)
+ test_support.run_suite(suite)
if __name__ == '__main__':
main()
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-28 07:48:18
|
perky 03/05/28 00:48:17
Added: tests/sampletexts gb18030.txt gb18030.utf8 gb2312.txt
gb2312.utf8 gbk.txt gbk.utf8
Log:
Add unittests for chinese encodings.
Revision Changes Path
1.1 cjkcodecs/tests/sampletexts/gb18030.txt
<<Binary file>>
1.1 cjkcodecs/tests/sampletexts/gb18030.utf8
<<Binary file>>
1.1 cjkcodecs/tests/sampletexts/gb2312.txt
<<Binary file>>
1.1 cjkcodecs/tests/sampletexts/gb2312.utf8
<<Binary file>>
1.1 cjkcodecs/tests/sampletexts/gbk.txt
<<Binary file>>
1.1 cjkcodecs/tests/sampletexts/gbk.utf8
<<Binary file>>
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-28 07:37:57
|
perky 03/05/28 00:37:55 Modified: src/maps tweak_gbk.h Log: Add a tweak for 0xA840 gbk/gb2312 inconsistency. Revision Changes Path 1.3 +4 -2 cjkcodecs/src/maps/tweak_gbk.h Index: tweak_gbk.h =================================================================== RCS file: /cvsroot/koco/cjkcodecs/src/maps/tweak_gbk.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tweak_gbk.h 20 May 2003 10:59:09 -0000 1.2 +++ tweak_gbk.h 28 May 2003 07:37:55 -0000 1.3 @@ -1,8 +1,10 @@ -/* $Id: tweak_gbk.h,v 1.2 2003/05/20 10:59:09 perky Exp $ */ +/* $Id: tweak_gbk.h,v 1.3 2003/05/28 07:37:55 perky Exp $ */ #define GBK_PREDECODE(dc1, dc2, assi) \ - if ((dc1) == 0xa1 && (dc2) == 0xaa) (assi) = 0x2014; \ + if ((dc1) == 0xa1 && (dc2) == 0xaa) (assi) = 0x2014; \ + else if ((dc1) == 0xa8 && (dc2) == 0x44) (assi) = 0x2015; \ else if ((dc1) == 0xa1 && (dc2) == 0xa4) (assi) = 0x00b7; #define GBK_PREENCODE(code, assi) \ if ((code) == 0x2014) (assi) = 0xa1aa; \ + else if ((code) == 0x2015) (assi) = 0xa844; \ else if ((code) == 0x00b7) (assi) = 0xa1a4; |
|
From: Hye-Shik C. <pe...@us...> - 2003-05-28 07:01:39
|
perky 03/05/28 00:01:37 Added: tests/sampletexts big5.txt big5.utf8 Log: Add unittests for taiwanese encodings Revision Changes Path 1.1 cjkcodecs/tests/sampletexts/big5.txt <<Binary file>> 1.1 cjkcodecs/tests/sampletexts/big5.utf8 <<Binary file>> |
|
From: Hye-Shik C. <pe...@us...> - 2003-05-28 07:01:37
|
perky 03/05/28 00:01:36
Added: tests test_encoding_big5.py test_mapping_cp950.py
Log:
Add unittests for taiwanese encodings
Revision Changes Path
1.1 cjkcodecs/tests/test_encoding_big5.py
Index: test_encoding_big5.py
===================================================================
#!/usr/bin/env python
#
# test_encoding_big5.py: Encoding test for the Big5 codec
#
# Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# $Id: test_encoding_big5.py,v 1.1 2003/05/28 07:01:35 perky Exp $
#
from test import test_support
import test_multibytecodec_support
import unittest
class Test_Big5(test_multibytecodec_support.TestBase, unittest.TestCase):
encoding = 'big5'
tstring = test_multibytecodec_support.load_teststring('big5')
errortests = (
# invalid bytes
("abc\x80\x80\xc1\xc4", "strict", None),
("abc\xc8", "strict", None),
("abc\x80\x80\xc1\xc4", "replace", u"abc\ufffd\u8b10"),
("abc\x80\x80\xc1\xc4\xc8", "replace", u"abc\ufffd\u8b10\ufffd"),
("abc\x80\x80\xc1\xc4", "ignore", u"abc\u8b10"),
)
def test_main():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(Test_Big5))
test_support.run_suite(suite)
if __name__ == "__main__":
test_main()
# ex: ts=8 sts=4 et
1.1 cjkcodecs/tests/test_mapping_cp950.py
Index: test_mapping_cp950.py
===================================================================
#!/usr/bin/env python
#
# test_encoding_cp950.py: Encoding test for the CP950 codec
#
# Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# $Id: test_mapping_cp950.py,v 1.1 2003/05/28 07:01:35 perky Exp $
#
from test import test_support
import test_multibytecodec_support
import sys, codecs, os
import unittest
class TestCP950Map(test_multibytecodec_support.TestBase_Mapping,
unittest.TestCase):
encoding = 'cp950'
mapfilename = 'CP950.TXT'
def test_main():
if not os.path.exists('CP950.TXT'):
raise test_support.TestSkipped(
'CP950.TXT not found, download from http://www.unicode.'
'org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP950.TXT')
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestCP950Map))
test_support.run_suite(suite)
if __name__ == "__main__":
test_main()
# ex: ts=8 sts=4 et
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-28 06:51:35
|
perky 03/05/27 23:51:34
Modified: src/maps map_cp950ext.h
Log:
Fix wrong overriding cp950 encmap over big5's.
Revision Changes Path
1.3 +27 -27 cjkcodecs/src/maps/map_cp950ext.h
Index: map_cp950ext.h
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/maps/map_cp950ext.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- map_cp950ext.h 17 May 2003 20:58:58 -0000 1.2
+++ map_cp950ext.h 28 May 2003 06:51:34 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: map_cp950ext.h,v 1.2 2003/05/17 20:58:58 perky Exp $
+ * $Id: map_cp950ext.h,v 1.3 2003/05/28 06:51:34 perky Exp $
*/
static const Py_UNICODE __cp950ext_decmap[371] = {
@@ -311,7 +311,7 @@
/* 0xFF */ {0, 0, 0},
};
-static const DBCHAR __cp950ext_encmap[588] = {
+static const DBCHAR __cp950ext_encmap[587] = {
0xa1c2, 0xa1c5, 0xa145, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
@@ -345,30 +345,31 @@
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
- 0xa1f2, NOCHAR, NOCHAR, NOCHAR, 0xa1f3, 0xf9f9, 0xf9f8, 0xf9e6,
- 0xf9ef, 0xf9dd, 0xf9e8, 0xf9f1, 0xf9df, 0xf9ec, 0xf9f5, 0xf9e3,
- 0xf9ee, 0xf9f7, 0xf9e5, 0xf9e9, 0xf9f2, 0xf9e0, 0xf9eb, 0xf9f4,
- 0xf9e2, 0xf9e7, 0xf9f0, 0xf9de, 0xf9ed, 0xf9f6, 0xf9e4, 0xf9ea,
- 0xf9f3, 0xf9e1, 0xf9fa, 0xf9fb, 0xf9fd, 0xf9fc, NOCHAR, NOCHAR,
- NOCHAR, 0xa15a, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
+ 0xa1f2, NOCHAR, NOCHAR, NOCHAR, 0xa1f3, 0xf9f8, 0xf9e6, 0xf9ef,
+ 0xf9dd, 0xf9e8, 0xf9f1, 0xf9df, 0xf9ec, 0xf9f5, 0xf9e3, 0xf9ee,
+ 0xf9f7, 0xf9e5, NOCHAR, 0xf9f2, 0xf9e0, NOCHAR, 0xf9f4, 0xf9e2,
+ 0xf9e7, 0xf9f0, 0xf9de, 0xf9ed, 0xf9f6, 0xf9e4, NOCHAR, 0xf9f3,
+ 0xf9e1, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
+ 0xa15a, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
+ NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, 0xf9fe,
+ 0xa2cc, NOCHAR, NOCHAR, NOCHAR, 0xa2ce, 0xf9d9, 0xf9dc, 0xf9da,
+ 0xf9d6, 0xf9db, 0xf9d8, 0xf9d7, 0xa14e, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
- 0xf9fe, 0xa2cc, NOCHAR, NOCHAR, NOCHAR, 0xa2ce, 0xf9d9, 0xf9dc,
- 0xf9da, 0xf9d6, 0xf9db, 0xf9d8, 0xf9d7, 0xa14e, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
+ NOCHAR, NOCHAR, NOCHAR, 0xa242, 0xa1fe, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
- NOCHAR, NOCHAR, NOCHAR, NOCHAR, 0xa242, 0xa1fe, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
+ NOCHAR, 0xa240, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
- NOCHAR, NOCHAR, 0xa240, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
+ NOCHAR, NOCHAR, NOCHAR, 0xa1e3, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
- NOCHAR, NOCHAR, NOCHAR, NOCHAR, 0xa1e3, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
@@ -383,9 +384,8 @@
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
- NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR,
- NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, 0xa246, 0xa247,
- NOCHAR, 0xa1c3, NOCHAR, 0xa244,
+ NOCHAR, NOCHAR, NOCHAR, NOCHAR, NOCHAR, 0xa246, 0xa247, NOCHAR,
+ 0xa1c3, NOCHAR, 0xa244,
};
static const struct unim_index cp950ext_encmap[256] = {
@@ -426,7 +426,7 @@
/* 0x22 */ {__cp950ext_encmap+136, 0x15, 0x99},
/* 0x23 */ {0, 0, 0},
/* 0x24 */ {0, 0, 0},
-/* 0x25 */ {__cp950ext_encmap+269, 0x50, 0x93},
+/* 0x25 */ {__cp950ext_encmap+269, 0x51, 0x93},
/* 0x26 */ {0, 0, 0},
/* 0x27 */ {0, 0, 0},
/* 0x28 */ {0, 0, 0},
@@ -472,20 +472,20 @@
/* 0x50 */ {0, 0, 0},
/* 0x51 */ {0, 0, 0},
/* 0x52 */ {0, 0, 0},
-/* 0x53 */ {__cp950ext_encmap+337, 0x41, 0x45},
+/* 0x53 */ {__cp950ext_encmap+336, 0x41, 0x45},
/* 0x54 */ {0, 0, 0},
/* 0x55 */ {0, 0, 0},
/* 0x56 */ {0, 0, 0},
/* 0x57 */ {0, 0, 0},
-/* 0x58 */ {__cp950ext_encmap+342, 0xbb, 0xbb},
+/* 0x58 */ {__cp950ext_encmap+341, 0xbb, 0xbb},
/* 0x59 */ {0, 0, 0},
-/* 0x5A */ {__cp950ext_encmap+343, 0xfa, 0xfa},
+/* 0x5A */ {__cp950ext_encmap+342, 0xfa, 0xfa},
/* 0x5B */ {0, 0, 0},
/* 0x5C */ {0, 0, 0},
/* 0x5D */ {0, 0, 0},
/* 0x5E */ {0, 0, 0},
/* 0x5F */ {0, 0, 0},
-/* 0x60 */ {__cp950ext_encmap+344, 0x52, 0x52},
+/* 0x60 */ {__cp950ext_encmap+343, 0x52, 0x52},
/* 0x61 */ {0, 0, 0},
/* 0x62 */ {0, 0, 0},
/* 0x63 */ {0, 0, 0},
@@ -509,11 +509,11 @@
/* 0x75 */ {0, 0, 0},
/* 0x76 */ {0, 0, 0},
/* 0x77 */ {0, 0, 0},
-/* 0x78 */ {__cp950ext_encmap+345, 0x81, 0x81},
+/* 0x78 */ {__cp950ext_encmap+344, 0x81, 0x81},
/* 0x79 */ {0, 0, 0},
/* 0x7A */ {0, 0, 0},
/* 0x7B */ {0, 0, 0},
-/* 0x7C */ {__cp950ext_encmap+346, 0xa7, 0xa7},
+/* 0x7C */ {__cp950ext_encmap+345, 0xa7, 0xa7},
/* 0x7D */ {0, 0, 0},
/* 0x7E */ {0, 0, 0},
/* 0x7F */ {0, 0, 0},
@@ -525,7 +525,7 @@
/* 0x85 */ {0, 0, 0},
/* 0x86 */ {0, 0, 0},
/* 0x87 */ {0, 0, 0},
-/* 0x88 */ {__cp950ext_encmap+347, 0xcf, 0xcf},
+/* 0x88 */ {__cp950ext_encmap+346, 0xcf, 0xcf},
/* 0x89 */ {0, 0, 0},
/* 0x8A */ {0, 0, 0},
/* 0x8B */ {0, 0, 0},
@@ -535,7 +535,7 @@
/* 0x8F */ {0, 0, 0},
/* 0x90 */ {0, 0, 0},
/* 0x91 */ {0, 0, 0},
-/* 0x92 */ {__cp950ext_encmap+348, 0xb9, 0xb9},
+/* 0x92 */ {__cp950ext_encmap+347, 0xb9, 0xb9},
/* 0x93 */ {0, 0, 0},
/* 0x94 */ {0, 0, 0},
/* 0x95 */ {0, 0, 0},
@@ -643,7 +643,7 @@
/* 0xFB */ {0, 0, 0},
/* 0xFC */ {0, 0, 0},
/* 0xFD */ {0, 0, 0},
-/* 0xFE */ {__cp950ext_encmap+349, 0x51, 0x68},
-/* 0xFF */ {__cp950ext_encmap+373, 0x0f, 0xe5},
+/* 0xFE */ {__cp950ext_encmap+348, 0x51, 0x68},
+/* 0xFF */ {__cp950ext_encmap+372, 0x0f, 0xe5},
};
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-28 06:51:35
|
perky 03/05/27 23:51:34
Modified: tools genmap_tchinese.py
Log:
Fix wrong overriding cp950 encmap over big5's.
Revision Changes Path
1.2 +9 -3 cjkcodecs/tools/genmap_tchinese.py
Index: genmap_tchinese.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tools/genmap_tchinese.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- genmap_tchinese.py 17 May 2003 20:33:06 -0000 1.1
+++ genmap_tchinese.py 28 May 2003 06:51:33 -0000 1.2
@@ -26,7 +26,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: genmap_tchinese.py,v 1.1 2003/05/17 20:33:06 perky Exp $
+# $Id: genmap_tchinese.py,v 1.2 2003/05/28 06:51:33 perky Exp $
#
from genmap_support import *
@@ -60,13 +60,19 @@
if not (not big5decmap.has_key(c1) or not big5decmap[c1].has_key(c2)
or big5decmap[c1][c2] != code):
del cp950decmap[c1][c2]
- else:
- cp950encmap.setdefault(code >> 8, {})
+ cp950encmap.setdefault(code >> 8, {})
+ if not cp950encmap[code >> 8].has_key(code & 0xff):
cp950encmap[code >> 8][code & 0xff] = c1 << 8 | c2
for c1, m in big5decmap.items():
for c2, code in m.items():
big5encmap.setdefault(code >> 8, {})
big5encmap[code >> 8][code & 0xff] = c1 << 8 | c2
+ if (cp950encmap.has_key(code >> 8) and
+ cp950encmap[code >> 8].has_key(code & 0xff) and
+ cp950encmap[code >> 8][code & 0xff] == c1 << 8 | c2):
+ del cp950encmap[code >> 8][code & 0xff]
+ if not cp950encmap[code >> 8]:
+ del cp950encmap[code >>8]
omap = open('map_big5.h', 'w')
printcopyright(omap)
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-27 06:49:49
|
perky 03/05/26 23:49:43
Added: tests test_mapping_euc_kr.py
Log:
Add a mapping test for euc-kr
Revision Changes Path
1.1 cjkcodecs/tests/test_mapping_euc_kr.py
Index: test_mapping_euc_kr.py
===================================================================
#!/usr/bin/env python
#
# test_mapping_euc_kr.py: Mapping test for EUC-KR codec
#
# Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# $Id: test_mapping_euc_kr.py,v 1.1 2003/05/27 06:49:42 perky Exp $
#
from test import test_support
import test_multibytecodec_support
import sys, codecs, os
import unittest
class TestEUCKRMap(test_multibytecodec_support.TestBase_Mapping,
unittest.TestCase):
encoding = 'euc_kr'
mapfilename = 'EUC-KR.TXT'
def test_main():
if not os.path.exists('EUC-KR.TXT'):
raise test_support.TestSkipped(
'EUC-KR.TXT not found, download from http://people.freebsd'
'.org/~perky/i18n/EUC-KR.TXT')
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestEUCKRMap))
test_support.run_suite(suite)
if __name__ == "__main__":
test_main()
# ex: ts=8 sts=4 et
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-27 06:32:36
|
perky 03/05/26 23:32:36
Modified: src multibytecodec.c
Log:
Increase refcount of self->stream before resolving error
callback. Destructor could try to decref for self->stream
when the resolving was failed.
Revision Changes Path
1.12 +10 -10 cjkcodecs/src/multibytecodec.c
Index: multibytecodec.c
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/multibytecodec.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- multibytecodec.c 27 May 2003 06:24:41 -0000 1.11
+++ multibytecodec.c 27 May 2003 06:32:36 -0000 1.12
@@ -26,7 +26,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: multibytecodec.c,v 1.11 2003/05/27 06:24:41 perky Exp $
+ * $Id: multibytecodec.c,v 1.12 2003/05/27 06:32:36 perky Exp $
*/
#include "Python.h"
@@ -1064,16 +1064,16 @@
if (self == NULL)
return NULL;
- self->errors = get_errorcallback(errors);
- if (self->errors == NULL) {
- Py_DECREF(self);
- return NULL;
- }
self->codec = codec;
self->stream = stream;
Py_INCREF(stream);
self->state.p = NULL;
self->pendingsize = 0;
+ self->errors = get_errorcallback(errors);
+ if (self->errors == NULL) {
+ Py_DECREF(self);
+ return NULL;
+ }
return (PyObject *)self;
}
@@ -1089,15 +1089,15 @@
if (self == NULL)
return NULL;
+ self->codec = codec;
+ self->stream = stream;
+ Py_INCREF(stream);
+ self->state.p = NULL;
self->errors = get_errorcallback(errors);
if (self->errors == NULL) {
Py_DECREF(self);
return NULL;
}
- self->codec = codec;
- self->stream = stream;
- Py_INCREF(stream);
- self->state.p = NULL;
return (PyObject *)self;
}
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-27 06:24:42
|
perky 03/05/26 23:24:41
Modified: src multibytecodec.c
Log:
Fix refcount leaks on destructors of StreamReader and StreamWriter.
Revision Changes Path
1.11 +10 -2 cjkcodecs/src/multibytecodec.c
Index: multibytecodec.c
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/multibytecodec.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- multibytecodec.c 20 May 2003 06:42:40 -0000 1.10
+++ multibytecodec.c 27 May 2003 06:24:41 -0000 1.11
@@ -26,7 +26,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: multibytecodec.c,v 1.10 2003/05/20 06:42:40 perky Exp $
+ * $Id: multibytecodec.c,v 1.11 2003/05/27 06:24:41 perky Exp $
*/
#include "Python.h"
@@ -849,8 +849,12 @@
};
static void
-mbstreamreader_dealloc(MultibyteStreamWriterObject *self)
+mbstreamreader_dealloc(MultibyteStreamReaderObject *self)
{
+ if (self->errors > ERROR_MAX) {
+ Py_DECREF(self->errors);
+ }
+ Py_DECREF(self->stream);
PyObject_Del(self);
}
@@ -980,6 +984,10 @@
static void
mbstreamwriter_dealloc(MultibyteStreamWriterObject *self)
{
+ if (self->errors > ERROR_MAX) {
+ Py_DECREF(self->errors);
+ }
+ Py_DECREF(self->stream);
PyObject_Del(self);
}
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-27 05:25:07
|
perky 03/05/26 22:17:48
Modified: tests test_encoding_cp932.py test_encoding_euc_jp.py
test_encoding_shift_jis.py
test_multibytecodec_support.py
Added: tests test_encoding_cp949.py test_encoding_euc_kr.py
test_mapping_cp949.py
Log:
- Add unittests for korean encodings.
- Use raw sample text files.
Revision Changes Path
1.3 +2 -2 cjkcodecs/tests/test_encoding_cp932.py
Index: test_encoding_cp932.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tests/test_encoding_cp932.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- test_encoding_cp932.py 26 May 2003 11:48:01 -0000 1.2
+++ test_encoding_cp932.py 27 May 2003 05:17:47 -0000 1.3
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: test_encoding_cp932.py,v 1.2 2003/05/26 11:48:01 perky Exp $
+# $Id: test_encoding_cp932.py,v 1.3 2003/05/27 05:17:47 perky Exp $
#
from test import test_support
@@ -36,7 +36,7 @@
class Test_CP932(test_multibytecodec_support.TestBase, unittest.TestCase):
encoding = 'cp932'
- from sampletexts.shift_jis import teststring as tstring
+ tstring = test_multibytecodec_support.load_teststring('shift_jis')
errortests = (
# invalid bytes
("abc\x80\x80\x82\x84", "strict", None),
1.2 +2 -2 cjkcodecs/tests/test_encoding_euc_jp.py
Index: test_encoding_euc_jp.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tests/test_encoding_euc_jp.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test_encoding_euc_jp.py 26 May 2003 11:40:41 -0000 1.1
+++ test_encoding_euc_jp.py 27 May 2003 05:17:47 -0000 1.2
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: test_encoding_euc_jp.py,v 1.1 2003/05/26 11:40:41 perky Exp $
+# $Id: test_encoding_euc_jp.py,v 1.2 2003/05/27 05:17:47 perky Exp $
#
from test import test_support
@@ -36,7 +36,7 @@
class Test_EUC_JP(test_multibytecodec_support.TestBase, unittest.TestCase):
encoding = 'euc_jp'
- from sampletexts.euc_jp import teststring as tstring
+ tstring = test_multibytecodec_support.load_teststring('euc_jp')
errortests = (
# invalid bytes
("abc\x80\x80\xc1\xc4", "strict", None),
1.3 +2 -2 cjkcodecs/tests/test_encoding_shift_jis.py
Index: test_encoding_shift_jis.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tests/test_encoding_shift_jis.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- test_encoding_shift_jis.py 26 May 2003 15:07:49 -0000 1.2
+++ test_encoding_shift_jis.py 27 May 2003 05:17:48 -0000 1.3
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: test_encoding_shift_jis.py,v 1.2 2003/05/26 15:07:49 perky Exp $
+# $Id: test_encoding_shift_jis.py,v 1.3 2003/05/27 05:17:48 perky Exp $
#
from test import test_support
@@ -36,7 +36,7 @@
class Test_SJIS(test_multibytecodec_support.TestBase, unittest.TestCase):
encoding = 'shift_jis'
- from sampletexts.shift_jis import teststring as tstring
+ tstring = test_multibytecodec_support.load_teststring('shift_jis')
errortests = (
# invalid bytes
("abc\x80\x80\x82\x84", "strict", None),
1.4 +7 -2 cjkcodecs/tests/test_multibytecodec_support.py
Index: test_multibytecodec_support.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tests/test_multibytecodec_support.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test_multibytecodec_support.py 26 May 2003 15:08:49 -0000 1.3
+++ test_multibytecodec_support.py 27 May 2003 05:17:48 -0000 1.4
@@ -27,10 +27,10 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: test_multibytecodec_support.py,v 1.3 2003/05/26 15:08:49 perky Exp $
+# $Id: test_multibytecodec_support.py,v 1.4 2003/05/27 05:17:48 perky Exp $
#
-import sys, codecs
+import sys, codecs, os.path
import unittest
from StringIO import StringIO
@@ -190,5 +190,10 @@
self.assertEqual(unich.encode(self.encoding), csetch)
if (csetch, unich) not in self.pass_dectest:
self.assertEqual(unicode(csetch, self.encoding), unich)
+
+def load_teststring(encoding):
+ etxt = open(os.path.join('sampletexts', encoding) + '.txt').read()
+ utxt = open(os.path.join('sampletexts', encoding) + '.utf8').read()
+ return (etxt, utxt)
# ex: ts=8 sts=4 et
1.1 cjkcodecs/tests/test_encoding_cp949.py
Index: test_encoding_cp949.py
===================================================================
#!/usr/bin/env python
#
# test_encoding_cp949.py: Encoding test for the CP949 codec
#
# Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# $Id: test_encoding_cp949.py,v 1.1 2003/05/27 05:17:47 perky Exp $
#
from test import test_support
import test_multibytecodec_support
import unittest
class Test_CP949(test_multibytecodec_support.TestBase, unittest.TestCase):
encoding = 'cp949'
tstring = test_multibytecodec_support.load_teststring('cp949')
errortests = (
# invalid bytes
("abc\x80\x80\xc1\xc4", "strict", None),
("abc\xc8", "strict", None),
("abc\x80\x80\xc1\xc4", "replace", u"abc\ufffd\uc894"),
("abc\x80\x80\xc1\xc4\xc8", "replace", u"abc\ufffd\uc894\ufffd"),
("abc\x80\x80\xc1\xc4", "ignore", u"abc\uc894"),
)
def test_main():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(Test_CP949))
test_support.run_suite(suite)
if __name__ == "__main__":
test_main()
# ex: ts=8 sts=4 et
1.1 cjkcodecs/tests/test_encoding_euc_kr.py
Index: test_encoding_euc_kr.py
===================================================================
#!/usr/bin/env python
#
# test_encoding_euc_kr.py: Encoding test for the EUC-KR codec
#
# Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# $Id: test_encoding_euc_kr.py,v 1.1 2003/05/27 05:17:48 perky Exp $
#
from test import test_support
import test_multibytecodec_support
import unittest
class Test_EUCKR(test_multibytecodec_support.TestBase, unittest.TestCase):
encoding = 'euc_kr'
tstring = test_multibytecodec_support.load_teststring('euc_kr')
errortests = (
# invalid bytes
("abc\x80\x80\xc1\xc4", "strict", None),
("abc\xc8", "strict", None),
("abc\x80\x80\xc1\xc4", "replace", u"abc\ufffd\uc894"),
("abc\x80\x80\xc1\xc4\xc8", "replace", u"abc\ufffd\uc894\ufffd"),
("abc\x80\x80\xc1\xc4", "ignore", u"abc\uc894"),
)
def test_main():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(Test_EUCKR))
test_support.run_suite(suite)
if __name__ == "__main__":
test_main()
# ex: ts=8 sts=4 et
1.1 cjkcodecs/tests/test_mapping_cp949.py
Index: test_mapping_cp949.py
===================================================================
#!/usr/bin/env python
#
# test_encoding_cp949.py: Encoding test for the CP949 codec
#
# Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# $Id: test_mapping_cp949.py,v 1.1 2003/05/27 05:17:48 perky Exp $
#
from test import test_support
import test_multibytecodec_support
import sys, codecs, os
import unittest
class TestCP949Map(test_multibytecodec_support.TestBase_Mapping, unittest.TestCase):
encoding = 'cp949'
mapfilename = 'CP949.TXT'
def test_main():
if not os.path.exists('CP949.TXT'):
raise test_support.TestSkipped(
'CP949.TXT not found, download from http://www.unicode.'
'org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP949.TXT')
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestCP949Map))
test_support.run_suite(suite)
if __name__ == "__main__":
test_main()
# ex: ts=8 sts=4 et
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-27 04:50:30
|
perky 03/05/26 21:50:17
Added: tests/sampletexts cp949.txt cp949.utf8 euc_jp.txt
euc_jp.utf8 euc_kr.txt euc_kr.utf8 shift_jis.txt
shift_jis.utf8
Removed: tests/sampletexts __init__.py euc_jp.py shift_jis.py
Log:
Use raw texts instead of python sources.
Revision Changes Path
1.1 cjkcodecs/tests/sampletexts/cp949.txt
<<Binary file>>
1.1 cjkcodecs/tests/sampletexts/cp949.utf8
<<Binary file>>
1.1 cjkcodecs/tests/sampletexts/euc_jp.txt
<<Binary file>>
1.1 cjkcodecs/tests/sampletexts/euc_jp.utf8
<<Binary file>>
1.1 cjkcodecs/tests/sampletexts/euc_kr.txt
<<Binary file>>
1.1 cjkcodecs/tests/sampletexts/euc_kr.utf8
<<Binary file>>
1.1 cjkcodecs/tests/sampletexts/shift_jis.txt
<<Binary file>>
1.1 cjkcodecs/tests/sampletexts/shift_jis.utf8
<<Binary file>>
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-27 04:31:01
|
perky 03/05/26 21:31:00
Modified: tools genmap_korean.py
Log:
Fix wrong cp949encmap mask.
Revision Changes Path
1.5 +2 -2 cjkcodecs/tools/genmap_korean.py
Index: genmap_korean.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tools/genmap_korean.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- genmap_korean.py 17 May 2003 17:50:36 -0000 1.4
+++ genmap_korean.py 27 May 2003 04:31:00 -0000 1.5
@@ -26,7 +26,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: genmap_korean.py,v 1.4 2003/05/17 17:50:36 perky Exp $
+# $Id: genmap_korean.py,v 1.5 2003/05/27 04:31:00 perky Exp $
#
from genmap_support import *
@@ -60,7 +60,7 @@
uhcdecmap.setdefault(c1, {})
uhcdecmap[c1][c2] = c2map[c2]
cp949encmap.setdefault(code >> 8, {}) # MSB set
- cp949encmap[code >> 8][code & 0xFF] = 0x8000 | (c1<<8 | c2) & 0x7f7f
+ cp949encmap[code >> 8][code & 0xFF] = (c1<<8 | c2)
omap = open('map_ksx1001.h', 'w')
printcopyright(omap)
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-27 04:30:32
|
perky 03/05/26 21:30:31
Modified: src/maps map_cp949.h
Log:
Fix wrong cp949encmap masking
Revision Changes Path
1.4 +885 -885 cjkcodecs/src/maps/map_cp949.h
Index: map_cp949.h
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/maps/map_cp949.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- map_cp949.h 17 May 2003 20:58:58 -0000 1.3
+++ map_cp949.h 27 May 2003 04:30:29 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * $Id: map_cp949.h,v 1.3 2003/05/17 20:58:58 perky Exp $
+ * $Id: map_cp949.h,v 1.4 2003/05/27 04:30:29 perky Exp $
*/
static const DBCHAR __cp949_encmap[33133] = {
@@ -2696,31 +2696,31 @@
0x303d, 0x8164, 0x8165, 0x303e, 0x8166, 0x8167, 0x8168, 0x303f,
0x8169, 0x816a, 0x816b, 0x816c, 0x816d, 0x816e, 0x816f, 0x8170,
0x8171, 0x8172, 0x3040, 0x8173, 0x3041, 0x8174, 0x8175, 0x8176,
- 0x8177, 0x8178, 0x8179, 0x3042, 0x817a, 0x8101, 0x8102, 0x3043,
- 0x8103, 0x8104, 0x8105, 0x3044, 0x8106, 0x8107, 0x8108, 0x8109,
- 0x810a, 0x810b, 0x810c, 0x810d, 0x810e, 0x810f, 0x8110, 0x8111,
- 0x8112, 0x8113, 0x8114, 0x8115, 0x8116, 0x8117, 0x8118, 0x3045,
- 0x3046, 0x8119, 0x811a, 0x3047, 0x811b, 0x811c, 0x3048, 0x3049,
- 0x811d, 0x304a, 0x811e, 0x811f, 0x8120, 0x8121, 0x8122, 0x304b,
- 0x304c, 0x8123, 0x304d, 0x304e, 0x304f, 0x3050, 0x8124, 0x8125,
- 0x3051, 0x3052, 0x3053, 0x3054, 0x8126, 0x8127, 0x8128, 0x3055,
- 0x8129, 0x812a, 0x812b, 0x3056, 0x812c, 0x812d, 0x812e, 0x812f,
- 0x8130, 0x8131, 0x8132, 0x3057, 0x3058, 0x8133, 0x3059, 0x305a,
- 0x305b, 0x8134, 0x8135, 0x8136, 0x8137, 0x8138, 0x8139, 0x305c,
- 0x305d, 0x305e, 0x813a, 0x305f, 0x813b, 0x813c, 0x3060, 0x3061,
- 0x813d, 0x813e, 0x813f, 0x8140, 0x8141, 0x8142, 0x8143, 0x3062,
- 0x3063, 0x8144, 0x3064, 0x3065, 0x3066, 0x8145, 0x8146, 0x8147,
- 0x3067, 0x8148, 0x8149, 0x3068, 0x814a, 0x814b, 0x814c, 0x3069,
- 0x814d, 0x814e, 0x814f, 0x306a, 0x8150, 0x8151, 0x8152, 0x8153,
- 0x8154, 0x8155, 0x8156, 0x8157, 0x306b, 0x8158, 0x306c, 0x8159,
- 0x815a, 0x815b, 0x815c, 0x815d, 0x815e, 0x815f, 0x8160, 0x306d,
- 0x306e, 0x8161, 0x8162, 0x306f, 0x8163, 0x8164, 0x3070, 0x3071,
- 0x8165, 0x3072, 0x8166, 0x3073, 0x8167, 0x8168, 0x3074, 0x3075,
- 0x3076, 0x8169, 0x3077, 0x816a, 0x3078, 0x3079, 0x816b, 0x816c,
- 0x816d, 0x816e, 0x816f, 0x307a, 0x307b, 0x8170, 0x8171, 0x307c,
- 0x8172, 0x8173, 0x8174, 0x307d, 0x8175, 0x307e, 0x8176, 0x8177,
- 0x8178, 0x8179, 0x817a, 0x3121, 0x3122, 0x817b, 0x3123, 0x817c,
- 0x3124, 0x817d, 0x817e, 0x8241, 0x8242, 0x8243, 0x8244, 0x3125,
+ 0x8177, 0x8178, 0x8179, 0x3042, 0x817a, 0x8181, 0x8182, 0x3043,
+ 0x8183, 0x8184, 0x8185, 0x3044, 0x8186, 0x8187, 0x8188, 0x8189,
+ 0x818a, 0x818b, 0x818c, 0x818d, 0x818e, 0x818f, 0x8190, 0x8191,
+ 0x8192, 0x8193, 0x8194, 0x8195, 0x8196, 0x8197, 0x8198, 0x3045,
+ 0x3046, 0x8199, 0x819a, 0x3047, 0x819b, 0x819c, 0x3048, 0x3049,
+ 0x819d, 0x304a, 0x819e, 0x819f, 0x81a0, 0x81a1, 0x81a2, 0x304b,
+ 0x304c, 0x81a3, 0x304d, 0x304e, 0x304f, 0x3050, 0x81a4, 0x81a5,
+ 0x3051, 0x3052, 0x3053, 0x3054, 0x81a6, 0x81a7, 0x81a8, 0x3055,
+ 0x81a9, 0x81aa, 0x81ab, 0x3056, 0x81ac, 0x81ad, 0x81ae, 0x81af,
+ 0x81b0, 0x81b1, 0x81b2, 0x3057, 0x3058, 0x81b3, 0x3059, 0x305a,
+ 0x305b, 0x81b4, 0x81b5, 0x81b6, 0x81b7, 0x81b8, 0x81b9, 0x305c,
+ 0x305d, 0x305e, 0x81ba, 0x305f, 0x81bb, 0x81bc, 0x3060, 0x3061,
+ 0x81bd, 0x81be, 0x81bf, 0x81c0, 0x81c1, 0x81c2, 0x81c3, 0x3062,
+ 0x3063, 0x81c4, 0x3064, 0x3065, 0x3066, 0x81c5, 0x81c6, 0x81c7,
+ 0x3067, 0x81c8, 0x81c9, 0x3068, 0x81ca, 0x81cb, 0x81cc, 0x3069,
+ 0x81cd, 0x81ce, 0x81cf, 0x306a, 0x81d0, 0x81d1, 0x81d2, 0x81d3,
+ 0x81d4, 0x81d5, 0x81d6, 0x81d7, 0x306b, 0x81d8, 0x306c, 0x81d9,
+ 0x81da, 0x81db, 0x81dc, 0x81dd, 0x81de, 0x81df, 0x81e0, 0x306d,
+ 0x306e, 0x81e1, 0x81e2, 0x306f, 0x81e3, 0x81e4, 0x3070, 0x3071,
+ 0x81e5, 0x3072, 0x81e6, 0x3073, 0x81e7, 0x81e8, 0x3074, 0x3075,
+ 0x3076, 0x81e9, 0x3077, 0x81ea, 0x3078, 0x3079, 0x81eb, 0x81ec,
+ 0x81ed, 0x81ee, 0x81ef, 0x307a, 0x307b, 0x81f0, 0x81f1, 0x307c,
+ 0x81f2, 0x81f3, 0x81f4, 0x307d, 0x81f5, 0x307e, 0x81f6, 0x81f7,
+ 0x81f8, 0x81f9, 0x81fa, 0x3121, 0x3122, 0x81fb, 0x3123, 0x81fc,
+ 0x3124, 0x81fd, 0x81fe, 0x8241, 0x8242, 0x8243, 0x8244, 0x3125,
0x8245, 0x8246, 0x8247, 0x3126, 0x8248, 0x8249, 0x824a, 0x3127,
0x824b, 0x824c, 0x824d, 0x824e, 0x824f, 0x8250, 0x8251, 0x8252,
0x3128, 0x8253, 0x8254, 0x3129, 0x312a, 0x8255, 0x8256, 0x8257,
@@ -2729,26 +2729,26 @@
0x826a, 0x826b, 0x826c, 0x312f, 0x3130, 0x826d, 0x3131, 0x826e,
0x3132, 0x826f, 0x8270, 0x8271, 0x8272, 0x8273, 0x8274, 0x3133,
0x8275, 0x8276, 0x8277, 0x3134, 0x8278, 0x8279, 0x827a, 0x3135,
- 0x8201, 0x8202, 0x8203, 0x8204, 0x8205, 0x8206, 0x8207, 0x8208,
- 0x3136, 0x8209, 0x3137, 0x820a, 0x820b, 0x820c, 0x820d, 0x820e,
- 0x820f, 0x8210, 0x8211, 0x3138, 0x3139, 0x8212, 0x8213, 0x313a,
- 0x8214, 0x8215, 0x313b, 0x313c, 0x313d, 0x313e, 0x8216, 0x8217,
- 0x8218, 0x8219, 0x313f, 0x3140, 0x3141, 0x821a, 0x3142, 0x821b,
- 0x3143, 0x3144, 0x821c, 0x821d, 0x821e, 0x821f, 0x8220, 0x3145,
- 0x3146, 0x8221, 0x8222, 0x3147, 0x8223, 0x8224, 0x8225, 0x3148,
- 0x8226, 0x8227, 0x8228, 0x8229, 0x822a, 0x822b, 0x822c, 0x822d,
- 0x822e, 0x822f, 0x8230, 0x3149, 0x314a, 0x8231, 0x8232, 0x8233,
- 0x8234, 0x8235, 0x8236, 0x314b, 0x8237, 0x8238, 0x8239, 0x823a,
- 0x823b, 0x823c, 0x823d, 0x823e, 0x823f, 0x8240, 0x8241, 0x8242,
- 0x8243, 0x8244, 0x8245, 0x8246, 0x8247, 0x8248, 0x314c, 0x8249,
- 0x824a, 0x824b, 0x824c, 0x824d, 0x824e, 0x824f, 0x8250, 0x314d,
- 0x314e, 0x8251, 0x8252, 0x314f, 0x8253, 0x8254, 0x8255, 0x3150,
- 0x8256, 0x8257, 0x8258, 0x8259, 0x825a, 0x825b, 0x825c, 0x3151,
- 0x3152, 0x825d, 0x3153, 0x825e, 0x825f, 0x8260, 0x8261, 0x8262,
- 0x8263, 0x8264, 0x8265, 0x3154, 0x8266, 0x8267, 0x8268, 0x3155,
- 0x8269, 0x826a, 0x826b, 0x3156, 0x826c, 0x826d, 0x826e, 0x826f,
- 0x8270, 0x8271, 0x8272, 0x8273, 0x8274, 0x8275, 0x8276, 0x8277,
- 0x8278, 0x8279, 0x827a, 0x827b, 0x827c, 0x827d, 0x827e, 0x3157,
+ 0x8281, 0x8282, 0x8283, 0x8284, 0x8285, 0x8286, 0x8287, 0x8288,
+ 0x3136, 0x8289, 0x3137, 0x828a, 0x828b, 0x828c, 0x828d, 0x828e,
+ 0x828f, 0x8290, 0x8291, 0x3138, 0x3139, 0x8292, 0x8293, 0x313a,
+ 0x8294, 0x8295, 0x313b, 0x313c, 0x313d, 0x313e, 0x8296, 0x8297,
+ 0x8298, 0x8299, 0x313f, 0x3140, 0x3141, 0x829a, 0x3142, 0x829b,
+ 0x3143, 0x3144, 0x829c, 0x829d, 0x829e, 0x829f, 0x82a0, 0x3145,
+ 0x3146, 0x82a1, 0x82a2, 0x3147, 0x82a3, 0x82a4, 0x82a5, 0x3148,
+ 0x82a6, 0x82a7, 0x82a8, 0x82a9, 0x82aa, 0x82ab, 0x82ac, 0x82ad,
+ 0x82ae, 0x82af, 0x82b0, 0x3149, 0x314a, 0x82b1, 0x82b2, 0x82b3,
+ 0x82b4, 0x82b5, 0x82b6, 0x314b, 0x82b7, 0x82b8, 0x82b9, 0x82ba,
+ 0x82bb, 0x82bc, 0x82bd, 0x82be, 0x82bf, 0x82c0, 0x82c1, 0x82c2,
+ 0x82c3, 0x82c4, 0x82c5, 0x82c6, 0x82c7, 0x82c8, 0x314c, 0x82c9,
+ 0x82ca, 0x82cb, 0x82cc, 0x82cd, 0x82ce, 0x82cf, 0x82d0, 0x314d,
+ 0x314e, 0x82d1, 0x82d2, 0x314f, 0x82d3, 0x82d4, 0x82d5, 0x3150,
+ 0x82d6, 0x82d7, 0x82d8, 0x82d9, 0x82da, 0x82db, 0x82dc, 0x3151,
+ 0x3152, 0x82dd, 0x3153, 0x82de, 0x82df, 0x82e0, 0x82e1, 0x82e2,
+ 0x82e3, 0x82e4, 0x82e5, 0x3154, 0x82e6, 0x82e7, 0x82e8, 0x3155,
+ 0x82e9, 0x82ea, 0x82eb, 0x3156, 0x82ec, 0x82ed, 0x82ee, 0x82ef,
+ 0x82f0, 0x82f1, 0x82f2, 0x82f3, 0x82f4, 0x82f5, 0x82f6, 0x82f7,
+ 0x82f8, 0x82f9, 0x82fa, 0x82fb, 0x82fc, 0x82fd, 0x82fe, 0x3157,
0x3158, 0x8341, 0x8342, 0x3159, 0x8343, 0x8344, 0x315a, 0x315b,
0x315c, 0x8345, 0x8346, 0x8347, 0x8348, 0x8349, 0x834a, 0x315d,
0x315e, 0x834b, 0x315f, 0x834c, 0x3160, 0x834d, 0x834e, 0x834f,
@@ -2757,28 +2757,28 @@
0x8365, 0x8366, 0x8367, 0x8368, 0x8369, 0x836a, 0x836b, 0x836c,
0x836d, 0x836e, 0x836f, 0x8370, 0x8371, 0x8372, 0x8373, 0x3162,
0x3163, 0x8374, 0x8375, 0x3164, 0x8376, 0x8377, 0x3165, 0x3166,
- 0x8378, 0x3167, 0x8379, 0x837a, 0x8301, 0x8302, 0x8303, 0x3168,
- 0x3169, 0x8304, 0x316a, 0x8305, 0x316b, 0x316c, 0x8306, 0x8307,
- 0x8308, 0x316d, 0x8309, 0x316e, 0x316f, 0x3170, 0x830a, 0x3171,
- 0x830b, 0x830c, 0x830d, 0x3172, 0x830e, 0x3173, 0x830f, 0x8310,
- 0x8311, 0x8312, 0x8313, 0x3174, 0x3175, 0x8314, 0x3176, 0x3177,
- 0x3178, 0x8315, 0x8316, 0x8317, 0x3179, 0x8318, 0x8319, 0x317a,
- 0x317b, 0x831a, 0x831b, 0x317c, 0x831c, 0x831d, 0x831e, 0x317d,
- 0x831f, 0x8320, 0x8321, 0x8322, 0x8323, 0x8324, 0x8325, 0x317e,
- 0x3221, 0x8326, 0x3222, 0x3223, 0x3224, 0x8327, 0x8328, 0x8329,
- 0x832a, 0x832b, 0x832c, 0x3225, 0x3226, 0x832d, 0x832e, 0x832f,
- 0x8330, 0x8331, 0x8332, 0x3227, 0x8333, 0x8334, 0x8335, 0x8336,
- 0x8337, 0x8338, 0x8339, 0x833a, 0x833b, 0x833c, 0x833d, 0x833e,
- 0x833f, 0x8340, 0x8341, 0x8342, 0x8343, 0x8344, 0x8345, 0x8346,
- 0x8347, 0x8348, 0x8349, 0x834a, 0x834b, 0x834c, 0x834d, 0x834e,
- 0x834f, 0x8350, 0x8351, 0x8352, 0x8353, 0x8354, 0x8355, 0x8356,
- 0x8357, 0x8358, 0x8359, 0x835a, 0x835b, 0x835c, 0x835d, 0x835e,
- 0x835f, 0x8360, 0x8361, 0x3228, 0x3229, 0x322a, 0x8362, 0x322b,
- 0x8363, 0x8364, 0x8365, 0x322c, 0x8366, 0x8367, 0x8368, 0x8369,
- 0x836a, 0x836b, 0x836c, 0x322d, 0x322e, 0x836d, 0x322f, 0x3230,
- 0x3231, 0x836e, 0x836f, 0x8370, 0x8371, 0x8372, 0x8373, 0x3232,
- 0x3233, 0x8374, 0x8375, 0x3234, 0x8376, 0x8377, 0x8378, 0x8379,
- 0x837a, 0x837b, 0x837c, 0x837d, 0x837e, 0x8441, 0x8442, 0x3235,
+ 0x8378, 0x3167, 0x8379, 0x837a, 0x8381, 0x8382, 0x8383, 0x3168,
+ 0x3169, 0x8384, 0x316a, 0x8385, 0x316b, 0x316c, 0x8386, 0x8387,
+ 0x8388, 0x316d, 0x8389, 0x316e, 0x316f, 0x3170, 0x838a, 0x3171,
+ 0x838b, 0x838c, 0x838d, 0x3172, 0x838e, 0x3173, 0x838f, 0x8390,
+ 0x8391, 0x8392, 0x8393, 0x3174, 0x3175, 0x8394, 0x3176, 0x3177,
+ 0x3178, 0x8395, 0x8396, 0x8397, 0x3179, 0x8398, 0x8399, 0x317a,
+ 0x317b, 0x839a, 0x839b, 0x317c, 0x839c, 0x839d, 0x839e, 0x317d,
+ 0x839f, 0x83a0, 0x83a1, 0x83a2, 0x83a3, 0x83a4, 0x83a5, 0x317e,
+ 0x3221, 0x83a6, 0x3222, 0x3223, 0x3224, 0x83a7, 0x83a8, 0x83a9,
+ 0x83aa, 0x83ab, 0x83ac, 0x3225, 0x3226, 0x83ad, 0x83ae, 0x83af,
+ 0x83b0, 0x83b1, 0x83b2, 0x3227, 0x83b3, 0x83b4, 0x83b5, 0x83b6,
+ 0x83b7, 0x83b8, 0x83b9, 0x83ba, 0x83bb, 0x83bc, 0x83bd, 0x83be,
+ 0x83bf, 0x83c0, 0x83c1, 0x83c2, 0x83c3, 0x83c4, 0x83c5, 0x83c6,
+ 0x83c7, 0x83c8, 0x83c9, 0x83ca, 0x83cb, 0x83cc, 0x83cd, 0x83ce,
+ 0x83cf, 0x83d0, 0x83d1, 0x83d2, 0x83d3, 0x83d4, 0x83d5, 0x83d6,
+ 0x83d7, 0x83d8, 0x83d9, 0x83da, 0x83db, 0x83dc, 0x83dd, 0x83de,
+ 0x83df, 0x83e0, 0x83e1, 0x3228, 0x3229, 0x322a, 0x83e2, 0x322b,
+ 0x83e3, 0x83e4, 0x83e5, 0x322c, 0x83e6, 0x83e7, 0x83e8, 0x83e9,
+ 0x83ea, 0x83eb, 0x83ec, 0x322d, 0x322e, 0x83ed, 0x322f, 0x3230,
+ 0x3231, 0x83ee, 0x83ef, 0x83f0, 0x83f1, 0x83f2, 0x83f3, 0x3232,
+ 0x3233, 0x83f4, 0x83f5, 0x3234, 0x83f6, 0x83f7, 0x83f8, 0x83f9,
+ 0x83fa, 0x83fb, 0x83fc, 0x83fd, 0x83fe, 0x8441, 0x8442, 0x3235,
0x8443, 0x8444, 0x3236, 0x8445, 0x3237, 0x8446, 0x8447, 0x8448,
0x8449, 0x844a, 0x844b, 0x3238, 0x844c, 0x844d, 0x844e, 0x3239,
0x844f, 0x8450, 0x8451, 0x323a, 0x8452, 0x8453, 0x8454, 0x8455,
@@ -2786,26 +2786,26 @@
0x8462, 0x8463, 0x8464, 0x8465, 0x323d, 0x8466, 0x8467, 0x323e,
0x8468, 0x8469, 0x846a, 0x846b, 0x846c, 0x846d, 0x846e, 0x846f,
0x8470, 0x8471, 0x8472, 0x8473, 0x8474, 0x8475, 0x8476, 0x8477,
- 0x8478, 0x8479, 0x847a, 0x8401, 0x8402, 0x8403, 0x8404, 0x8405,
- 0x8406, 0x8407, 0x8408, 0x323f, 0x3240, 0x8409, 0x840a, 0x3241,
- 0x840b, 0x3242, 0x840c, 0x3243, 0x840d, 0x840e, 0x840f, 0x8410,
- 0x8411, 0x8412, 0x8413, 0x3244, 0x3245, 0x8414, 0x3246, 0x8415,
- 0x3247, 0x3248, 0x3249, 0x8416, 0x8417, 0x8418, 0x8419, 0x324a,
- 0x324b, 0x841a, 0x841b, 0x841c, 0x841d, 0x841e, 0x841f, 0x324c,
- 0x8420, 0x8421, 0x8422, 0x8423, 0x8424, 0x8425, 0x8426, 0x8427,
- 0x8428, 0x8429, 0x842a, 0x324d, 0x324e, 0x842b, 0x842c, 0x842d,
- 0x842e, 0x842f, 0x8430, 0x324f, 0x3250, 0x8431, 0x8432, 0x8433,
- 0x8434, 0x8435, 0x8436, 0x8437, 0x8438, 0x8439, 0x843a, 0x843b,
- 0x843c, 0x843d, 0x843e, 0x843f, 0x8440, 0x8441, 0x8442, 0x8443,
- 0x3251, 0x8444, 0x8445, 0x8446, 0x8447, 0x8448, 0x8449, 0x3252,
- 0x844a, 0x844b, 0x844c, 0x3253, 0x844d, 0x844e, 0x844f, 0x3254,
- 0x8450, 0x8451, 0x8452, 0x8453, 0x8454, 0x8455, 0x8456, 0x3255,
- 0x3256, 0x8457, 0x8458, 0x8459, 0x3257, 0x845a, 0x845b, 0x845c,
- 0x845d, 0x845e, 0x845f, 0x3258, 0x8460, 0x8461, 0x8462, 0x8463,
- 0x8464, 0x8465, 0x8466, 0x8467, 0x8468, 0x8469, 0x846a, 0x846b,
- 0x846c, 0x846d, 0x846e, 0x846f, 0x8470, 0x8471, 0x8472, 0x8473,
- 0x8474, 0x8475, 0x8476, 0x8477, 0x8478, 0x8479, 0x847a, 0x3259,
- 0x325a, 0x847b, 0x847c, 0x325b, 0x847d, 0x847e, 0x8541, 0x325c,
+ 0x8478, 0x8479, 0x847a, 0x8481, 0x8482, 0x8483, 0x8484, 0x8485,
+ 0x8486, 0x8487, 0x8488, 0x323f, 0x3240, 0x8489, 0x848a, 0x3241,
+ 0x848b, 0x3242, 0x848c, 0x3243, 0x848d, 0x848e, 0x848f, 0x8490,
+ 0x8491, 0x8492, 0x8493, 0x3244, 0x3245, 0x8494, 0x3246, 0x8495,
+ 0x3247, 0x3248, 0x3249, 0x8496, 0x8497, 0x8498, 0x8499, 0x324a,
+ 0x324b, 0x849a, 0x849b, 0x849c, 0x849d, 0x849e, 0x849f, 0x324c,
+ 0x84a0, 0x84a1, 0x84a2, 0x84a3, 0x84a4, 0x84a5, 0x84a6, 0x84a7,
+ 0x84a8, 0x84a9, 0x84aa, 0x324d, 0x324e, 0x84ab, 0x84ac, 0x84ad,
+ 0x84ae, 0x84af, 0x84b0, 0x324f, 0x3250, 0x84b1, 0x84b2, 0x84b3,
+ 0x84b4, 0x84b5, 0x84b6, 0x84b7, 0x84b8, 0x84b9, 0x84ba, 0x84bb,
+ 0x84bc, 0x84bd, 0x84be, 0x84bf, 0x84c0, 0x84c1, 0x84c2, 0x84c3,
+ 0x3251, 0x84c4, 0x84c5, 0x84c6, 0x84c7, 0x84c8, 0x84c9, 0x3252,
+ 0x84ca, 0x84cb, 0x84cc, 0x3253, 0x84cd, 0x84ce, 0x84cf, 0x3254,
+ 0x84d0, 0x84d1, 0x84d2, 0x84d3, 0x84d4, 0x84d5, 0x84d6, 0x3255,
+ 0x3256, 0x84d7, 0x84d8, 0x84d9, 0x3257, 0x84da, 0x84db, 0x84dc,
+ 0x84dd, 0x84de, 0x84df, 0x3258, 0x84e0, 0x84e1, 0x84e2, 0x84e3,
+ 0x84e4, 0x84e5, 0x84e6, 0x84e7, 0x84e8, 0x84e9, 0x84ea, 0x84eb,
+ 0x84ec, 0x84ed, 0x84ee, 0x84ef, 0x84f0, 0x84f1, 0x84f2, 0x84f3,
+ 0x84f4, 0x84f5, 0x84f6, 0x84f7, 0x84f8, 0x84f9, 0x84fa, 0x3259,
+ 0x325a, 0x84fb, 0x84fc, 0x325b, 0x84fd, 0x84fe, 0x8541, 0x325c,
0x8542, 0x8543, 0x8544, 0x8545, 0x8546, 0x8547, 0x325d, 0x325e,
0x325f, 0x8548, 0x3260, 0x8549, 0x3261, 0x3262, 0x854a, 0x854b,
0x854c, 0x854d, 0x854e, 0x3263, 0x854f, 0x8550, 0x8551, 0x8552,
@@ -2814,27 +2814,27 @@
0x3266, 0x8567, 0x8568, 0x8569, 0x856a, 0x856b, 0x856c, 0x3267,
0x3268, 0x856d, 0x856e, 0x3269, 0x856f, 0x8570, 0x8571, 0x326a,
0x8572, 0x8573, 0x8574, 0x8575, 0x8576, 0x8577, 0x8578, 0x326b,
- 0x326c, 0x8579, 0x857a, 0x326d, 0x8501, 0x8502, 0x8503, 0x8504,
- 0x8505, 0x8506, 0x8507, 0x326e, 0x8508, 0x8509, 0x850a, 0x326f,
- 0x850b, 0x850c, 0x850d, 0x3270, 0x850e, 0x850f, 0x8510, 0x8511,
- 0x8512, 0x8513, 0x8514, 0x3271, 0x3272, 0x8515, 0x8516, 0x8517,
- 0x8518, 0x8519, 0x851a, 0x851b, 0x851c, 0x851d, 0x851e, 0x3273,
- 0x851f, 0x8520, 0x8521, 0x8522, 0x8523, 0x8524, 0x8525, 0x8526,
- 0x8527, 0x8528, 0x8529, 0x852a, 0x852b, 0x852c, 0x852d, 0x852e,
- 0x852f, 0x8530, 0x8531, 0x8532, 0x8533, 0x8534, 0x8535, 0x8536,
- 0x8537, 0x8538, 0x8539, 0x3274, 0x3275, 0x853a, 0x853b, 0x3276,
- 0x853c, 0x3277, 0x853d, 0x3278, 0x853e, 0x3279, 0x853f, 0x8540,
- 0x8541, 0x8542, 0x327a, 0x327b, 0x327c, 0x8543, 0x327d, 0x8544,
- 0x327e, 0x8545, 0x8546, 0x8547, 0x3321, 0x8548, 0x8549, 0x854a,
- 0x854b, 0x854c, 0x854d, 0x854e, 0x854f, 0x8550, 0x8551, 0x8552,
- 0x8553, 0x8554, 0x8555, 0x8556, 0x8557, 0x8558, 0x8559, 0x855a,
- 0x855b, 0x855c, 0x855d, 0x855e, 0x855f, 0x8560, 0x8561, 0x8562,
- 0x8563, 0x8564, 0x8565, 0x3322, 0x3323, 0x8566, 0x8567, 0x3324,
- 0x8568, 0x8569, 0x856a, 0x3325, 0x856b, 0x856c, 0x856d, 0x856e,
- 0x856f, 0x8570, 0x8571, 0x3326, 0x3327, 0x8572, 0x3328, 0x8573,
- 0x3329, 0x8574, 0x8575, 0x8576, 0x8577, 0x8578, 0x8579, 0x332a,
- 0x332b, 0x332c, 0x857a, 0x332d, 0x857b, 0x857c, 0x332e, 0x332f,
- 0x3330, 0x3331, 0x857d, 0x857e, 0x8641, 0x8642, 0x8643, 0x3332,
+ 0x326c, 0x8579, 0x857a, 0x326d, 0x8581, 0x8582, 0x8583, 0x8584,
+ 0x8585, 0x8586, 0x8587, 0x326e, 0x8588, 0x8589, 0x858a, 0x326f,
+ 0x858b, 0x858c, 0x858d, 0x3270, 0x858e, 0x858f, 0x8590, 0x8591,
+ 0x8592, 0x8593, 0x8594, 0x3271, 0x3272, 0x8595, 0x8596, 0x8597,
+ 0x8598, 0x8599, 0x859a, 0x859b, 0x859c, 0x859d, 0x859e, 0x3273,
+ 0x859f, 0x85a0, 0x85a1, 0x85a2, 0x85a3, 0x85a4, 0x85a5, 0x85a6,
+ 0x85a7, 0x85a8, 0x85a9, 0x85aa, 0x85ab, 0x85ac, 0x85ad, 0x85ae,
+ 0x85af, 0x85b0, 0x85b1, 0x85b2, 0x85b3, 0x85b4, 0x85b5, 0x85b6,
+ 0x85b7, 0x85b8, 0x85b9, 0x3274, 0x3275, 0x85ba, 0x85bb, 0x3276,
+ 0x85bc, 0x3277, 0x85bd, 0x3278, 0x85be, 0x3279, 0x85bf, 0x85c0,
+ 0x85c1, 0x85c2, 0x327a, 0x327b, 0x327c, 0x85c3, 0x327d, 0x85c4,
+ 0x327e, 0x85c5, 0x85c6, 0x85c7, 0x3321, 0x85c8, 0x85c9, 0x85ca,
+ 0x85cb, 0x85cc, 0x85cd, 0x85ce, 0x85cf, 0x85d0, 0x85d1, 0x85d2,
+ 0x85d3, 0x85d4, 0x85d5, 0x85d6, 0x85d7, 0x85d8, 0x85d9, 0x85da,
+ 0x85db, 0x85dc, 0x85dd, 0x85de, 0x85df, 0x85e0, 0x85e1, 0x85e2,
+ 0x85e3, 0x85e4, 0x85e5, 0x3322, 0x3323, 0x85e6, 0x85e7, 0x3324,
+ 0x85e8, 0x85e9, 0x85ea, 0x3325, 0x85eb, 0x85ec, 0x85ed, 0x85ee,
+ 0x85ef, 0x85f0, 0x85f1, 0x3326, 0x3327, 0x85f2, 0x3328, 0x85f3,
+ 0x3329, 0x85f4, 0x85f5, 0x85f6, 0x85f7, 0x85f8, 0x85f9, 0x332a,
+ 0x332b, 0x332c, 0x85fa, 0x332d, 0x85fb, 0x85fc, 0x332e, 0x332f,
+ 0x3330, 0x3331, 0x85fd, 0x85fe, 0x8641, 0x8642, 0x8643, 0x3332,
0x3333, 0x8644, 0x3334, 0x3335, 0x3336, 0x3337, 0x3338, 0x8645,
0x3339, 0x8646, 0x333a, 0x333b, 0x333c, 0x8647, 0x8648, 0x333d,
0x8649, 0x864a, 0x864b, 0x333e, 0x864c, 0x864d, 0x864e, 0x864f,
@@ -2844,54 +2844,54 @@
0x8665, 0x8666, 0x8667, 0x8668, 0x8669, 0x866a, 0x866b, 0x3348,
0x866c, 0x866d, 0x866e, 0x866f, 0x3349, 0x8670, 0x8671, 0x8672,
0x8673, 0x8674, 0x8675, 0x8676, 0x8677, 0x8678, 0x8679, 0x867a,
- 0x8601, 0x8602, 0x8603, 0x8604, 0x8605, 0x8606, 0x8607, 0x8608,
- 0x8609, 0x860a, 0x860b, 0x860c, 0x860d, 0x860e, 0x860f, 0x8610,
- 0x8611, 0x8612, 0x8613, 0x8614, 0x8615, 0x8616, 0x8617, 0x334a,
- 0x334b, 0x8618, 0x334c, 0x334d, 0x8619, 0x861a, 0x861b, 0x334e,
- 0x861c, 0x334f, 0x3350, 0x861d, 0x861e, 0x861f, 0x8620, 0x3351,
- 0x3352, 0x8621, 0x3353, 0x3354, 0x3355, 0x8622, 0x8623, 0x8624,
- 0x8625, 0x8626, 0x3356, 0x3357, 0x3358, 0x8627, 0x8628, 0x3359,
- 0x8629, 0x862a, 0x862b, 0x335a, 0x862c, 0x862d, 0x862e, 0x862f,
- 0x8630, 0x8631, 0x8632, 0x335b, 0x335c, 0x8633, 0x335d, 0x335e,
- 0x335f, 0x8634, 0x8635, 0x8636, 0x8637, 0x8638, 0x8639, 0x3360,
- 0x3361, 0x863a, 0x863b, 0x3362, 0x863c, 0x863d, 0x863e, 0x3363,
- 0x863f, 0x8640, 0x8641, 0x8642, 0x8643, 0x8644, 0x8645, 0x3364,
- 0x3365, 0x8646, 0x8647, 0x3366, 0x3367, 0x8648, 0x8649, 0x3368,
- 0x864a, 0x864b, 0x864c, 0x3369, 0x864d, 0x864e, 0x864f, 0x336a,
- 0x8650, 0x8651, 0x8652, 0x8653, 0x8654, 0x8655, 0x8656, 0x8657,
- 0x8658, 0x8659, 0x865a, 0x865b, 0x865c, 0x865d, 0x865e, 0x865f,
- 0x8660, 0x8661, 0x8662, 0x8663, 0x8664, 0x8665, 0x8666, 0x336b,
- 0x336c, 0x8667, 0x8668, 0x336d, 0x8669, 0x866a, 0x866b, 0x336e,
- 0x866c, 0x336f, 0x866d, 0x866e, 0x866f, 0x8670, 0x8671, 0x3370,
- 0x3371, 0x8672, 0x3372, 0x8673, 0x3373, 0x8674, 0x8675, 0x8676,
- 0x8677, 0x3374, 0x3375, 0x3376, 0x8678, 0x8679, 0x867a, 0x3377,
- 0x867b, 0x867c, 0x867d, 0x3378, 0x867e, 0x8741, 0x8742, 0x8743,
+ 0x8681, 0x8682, 0x8683, 0x8684, 0x8685, 0x8686, 0x8687, 0x8688,
+ 0x8689, 0x868a, 0x868b, 0x868c, 0x868d, 0x868e, 0x868f, 0x8690,
+ 0x8691, 0x8692, 0x8693, 0x8694, 0x8695, 0x8696, 0x8697, 0x334a,
+ 0x334b, 0x8698, 0x334c, 0x334d, 0x8699, 0x869a, 0x869b, 0x334e,
+ 0x869c, 0x334f, 0x3350, 0x869d, 0x869e, 0x869f, 0x86a0, 0x3351,
+ 0x3352, 0x86a1, 0x3353, 0x3354, 0x3355, 0x86a2, 0x86a3, 0x86a4,
+ 0x86a5, 0x86a6, 0x3356, 0x3357, 0x3358, 0x86a7, 0x86a8, 0x3359,
+ 0x86a9, 0x86aa, 0x86ab, 0x335a, 0x86ac, 0x86ad, 0x86ae, 0x86af,
+ 0x86b0, 0x86b1, 0x86b2, 0x335b, 0x335c, 0x86b3, 0x335d, 0x335e,
+ 0x335f, 0x86b4, 0x86b5, 0x86b6, 0x86b7, 0x86b8, 0x86b9, 0x3360,
+ 0x3361, 0x86ba, 0x86bb, 0x3362, 0x86bc, 0x86bd, 0x86be, 0x3363,
+ 0x86bf, 0x86c0, 0x86c1, 0x86c2, 0x86c3, 0x86c4, 0x86c5, 0x3364,
+ 0x3365, 0x86c6, 0x86c7, 0x3366, 0x3367, 0x86c8, 0x86c9, 0x3368,
+ 0x86ca, 0x86cb, 0x86cc, 0x3369, 0x86cd, 0x86ce, 0x86cf, 0x336a,
+ 0x86d0, 0x86d1, 0x86d2, 0x86d3, 0x86d4, 0x86d5, 0x86d6, 0x86d7,
+ 0x86d8, 0x86d9, 0x86da, 0x86db, 0x86dc, 0x86dd, 0x86de, 0x86df,
+ 0x86e0, 0x86e1, 0x86e2, 0x86e3, 0x86e4, 0x86e5, 0x86e6, 0x336b,
+ 0x336c, 0x86e7, 0x86e8, 0x336d, 0x86e9, 0x86ea, 0x86eb, 0x336e,
+ 0x86ec, 0x336f, 0x86ed, 0x86ee, 0x86ef, 0x86f0, 0x86f1, 0x3370,
+ 0x3371, 0x86f2, 0x3372, 0x86f3, 0x3373, 0x86f4, 0x86f5, 0x86f6,
+ 0x86f7, 0x3374, 0x3375, 0x3376, 0x86f8, 0x86f9, 0x86fa, 0x3377,
+ 0x86fb, 0x86fc, 0x86fd, 0x3378, 0x86fe, 0x8741, 0x8742, 0x8743,
0x8744, 0x8745, 0x8746, 0x8747, 0x8748, 0x8749, 0x874a, 0x3379,
0x874b, 0x874c, 0x874d, 0x874e, 0x874f, 0x8750, 0x8751, 0x8752,
0x8753, 0x8754, 0x8755, 0x8756, 0x8757, 0x8758, 0x8759, 0x875a,
0x8761, 0x8762, 0x8763, 0x8764, 0x8765, 0x8766, 0x8767, 0x8768,
0x8769, 0x876a, 0x876b, 0x876c, 0x876d, 0x876e, 0x876f, 0x8770,
0x8771, 0x8772, 0x8773, 0x337a, 0x8774, 0x8775, 0x8776, 0x337b,
- 0x8777, 0x8778, 0x8779, 0x337c, 0x877a, 0x8701, 0x8702, 0x8703,
- 0x8704, 0x8705, 0x8706, 0x337d, 0x337e, 0x8707, 0x3421, 0x8708,
- 0x8709, 0x870a, 0x870b, 0x870c, 0x870d, 0x870e, 0x870f, 0x3422,
- 0x3423, 0x8710, 0x8711, 0x3424, 0x8712, 0x8713, 0x8714, 0x3425,
- 0x8715, 0x8716, 0x8717, 0x8718, 0x8719, 0x871a, 0x871b, 0x871c,
- 0x3426, 0x871d, 0x3427, 0x871e, 0x3428, 0x871f, 0x8720, 0x8721,
- 0x8722, 0x8723, 0x8724, 0x3429, 0x342a, 0x8725, 0x8726, 0x342b,
- 0x8727, 0x8728, 0x342c, 0x342d, 0x8729, 0x872a, 0x872b, 0x872c,
- 0x872d, 0x872e, 0x872f, 0x342e, 0x342f, 0x8730, 0x3430, 0x8731,
- 0x3431, 0x8732, 0x8733, 0x8734, 0x8735, 0x8736, 0x8737, 0x3432,
- 0x8738, 0x8739, 0x873a, 0x873b, 0x873c, 0x873d, 0x873e, 0x873f,
- 0x8740, 0x8741, 0x8742, 0x8743, 0x8744, 0x8745, 0x8746, 0x8747,
- 0x8748, 0x8749, 0x874a, 0x3433, 0x874b, 0x874c, 0x874d, 0x874e,
- 0x874f, 0x8750, 0x8751, 0x3434, 0x8752, 0x8753, 0x8754, 0x8755,
- 0x8756, 0x8757, 0x8758, 0x8759, 0x875a, 0x875b, 0x875c, 0x875d,
- 0x875e, 0x875f, 0x8760, 0x8761, 0x8762, 0x8763, 0x8764, 0x8765,
- 0x8766, 0x8767, 0x8768, 0x8769, 0x876a, 0x876b, 0x876c, 0x3435,
- 0x876d, 0x876e, 0x876f, 0x3436, 0x8770, 0x8771, 0x8772, 0x3437,
- 0x8773, 0x8774, 0x8775, 0x8776, 0x8777, 0x8778, 0x8779, 0x3438,
- 0x3439, 0x877a, 0x877b, 0x877c, 0x877d, 0x877e, 0x8841, 0x8842,
+ 0x8777, 0x8778, 0x8779, 0x337c, 0x877a, 0x8781, 0x8782, 0x8783,
+ 0x8784, 0x8785, 0x8786, 0x337d, 0x337e, 0x8787, 0x3421, 0x8788,
+ 0x8789, 0x878a, 0x878b, 0x878c, 0x878d, 0x878e, 0x878f, 0x3422,
+ 0x3423, 0x8790, 0x8791, 0x3424, 0x8792, 0x8793, 0x8794, 0x3425,
+ 0x8795, 0x8796, 0x8797, 0x8798, 0x8799, 0x879a, 0x879b, 0x879c,
+ 0x3426, 0x879d, 0x3427, 0x879e, 0x3428, 0x879f, 0x87a0, 0x87a1,
+ 0x87a2, 0x87a3, 0x87a4, 0x3429, 0x342a, 0x87a5, 0x87a6, 0x342b,
+ 0x87a7, 0x87a8, 0x342c, 0x342d, 0x87a9, 0x87aa, 0x87ab, 0x87ac,
+ 0x87ad, 0x87ae, 0x87af, 0x342e, 0x342f, 0x87b0, 0x3430, 0x87b1,
+ 0x3431, 0x87b2, 0x87b3, 0x87b4, 0x87b5, 0x87b6, 0x87b7, 0x3432,
+ 0x87b8, 0x87b9, 0x87ba, 0x87bb, 0x87bc, 0x87bd, 0x87be, 0x87bf,
+ 0x87c0, 0x87c1, 0x87c2, 0x87c3, 0x87c4, 0x87c5, 0x87c6, 0x87c7,
+ 0x87c8, 0x87c9, 0x87ca, 0x3433, 0x87cb, 0x87cc, 0x87cd, 0x87ce,
+ 0x87cf, 0x87d0, 0x87d1, 0x3434, 0x87d2, 0x87d3, 0x87d4, 0x87d5,
+ 0x87d6, 0x87d7, 0x87d8, 0x87d9, 0x87da, 0x87db, 0x87dc, 0x87dd,
+ 0x87de, 0x87df, 0x87e0, 0x87e1, 0x87e2, 0x87e3, 0x87e4, 0x87e5,
+ 0x87e6, 0x87e7, 0x87e8, 0x87e9, 0x87ea, 0x87eb, 0x87ec, 0x3435,
+ 0x87ed, 0x87ee, 0x87ef, 0x3436, 0x87f0, 0x87f1, 0x87f2, 0x3437,
+ 0x87f3, 0x87f4, 0x87f5, 0x87f6, 0x87f7, 0x87f8, 0x87f9, 0x3438,
+ 0x3439, 0x87fa, 0x87fb, 0x87fc, 0x87fd, 0x87fe, 0x8841, 0x8842,
0x8843, 0x8844, 0x8845, 0x343a, 0x343b, 0x8846, 0x8847, 0x8848,
0x8849, 0x884a, 0x884b, 0x343c, 0x884c, 0x884d, 0x884e, 0x884f,
0x8850, 0x8851, 0x8852, 0x343d, 0x343e, 0x8853, 0x8854, 0x8855,
@@ -2900,29 +2900,29 @@
0x3444, 0x3445, 0x8867, 0x8868, 0x8869, 0x886a, 0x886b, 0x3446,
0x3447, 0x886c, 0x3448, 0x886d, 0x3449, 0x344a, 0x886e, 0x886f,
0x8870, 0x344b, 0x8871, 0x344c, 0x8872, 0x8873, 0x8874, 0x344d,
- 0x8875, 0x8876, 0x8877, 0x344e, 0x8878, 0x8879, 0x887a, 0x8801,
- 0x8802, 0x8803, 0x8804, 0x8805, 0x8806, 0x8807, 0x8808, 0x8809,
- 0x880a, 0x880b, 0x880c, 0x880d, 0x880e, 0x880f, 0x8810, 0x344f,
- 0x3450, 0x8811, 0x8812, 0x3451, 0x8813, 0x8814, 0x8815, 0x3452,
- 0x8816, 0x3453, 0x8817, 0x8818, 0x8819, 0x881a, 0x881b, 0x3454,
- 0x3455, 0x881c, 0x3456, 0x881d, 0x3457, 0x881e, 0x881f, 0x8820,
- 0x8821, 0x3458, 0x8822, 0x3459, 0x345a, 0x345b, 0x8823, 0x345c,
- 0x8824, 0x8825, 0x345d, 0x345e, 0x345f, 0x3460, 0x3461, 0x8826,
- 0x8827, 0x8828, 0x3462, 0x3463, 0x3464, 0x8829, 0x3465, 0x3466,
- 0x3467, 0x3468, 0x3469, 0x882a, 0x882b, 0x882c, 0x346a, 0x346b,
- 0x346c, 0x882d, 0x882e, 0x346d, 0x882f, 0x8830, 0x8831, 0x346e,
- 0x8832, 0x8833, 0x8834, 0x8835, 0x8836, 0x8837, 0x8838, 0x346f,
- 0x3470, 0x8839, 0x3471, 0x3472, 0x3473, 0x883a, 0x883b, 0x883c,
- 0x883d, 0x883e, 0x883f, 0x3474, 0x8840, 0x8841, 0x8842, 0x8843,
- 0x8844, 0x8845, 0x8846, 0x8847, 0x8848, 0x8849, 0x884a, 0x884b,
- 0x884c, 0x884d, 0x884e, 0x884f, 0x8850, 0x8851, 0x8852, 0x8853,
- 0x8854, 0x8855, 0x8856, 0x8857, 0x8858, 0x8859, 0x885a, 0x885b,
- 0x885c, 0x885d, 0x885e, 0x885f, 0x8860, 0x8861, 0x8862, 0x8863,
- 0x8864, 0x8865, 0x8866, 0x8867, 0x8868, 0x8869, 0x886a, 0x886b,
- 0x886c, 0x886d, 0x886e, 0x886f, 0x8870, 0x8871, 0x8872, 0x8873,
- 0x8874, 0x8875, 0x8876, 0x3475, 0x3476, 0x3477, 0x8877, 0x3478,
- 0x8878, 0x8879, 0x3479, 0x347a, 0x887a, 0x347b, 0x347c, 0x887b,
- 0x887c, 0x887d, 0x887e, 0x347d, 0x347e, 0x8941, 0x3521, 0x8942,
+ 0x8875, 0x8876, 0x8877, 0x344e, 0x8878, 0x8879, 0x887a, 0x8881,
+ 0x8882, 0x8883, 0x8884, 0x8885, 0x8886, 0x8887, 0x8888, 0x8889,
+ 0x888a, 0x888b, 0x888c, 0x888d, 0x888e, 0x888f, 0x8890, 0x344f,
+ 0x3450, 0x8891, 0x8892, 0x3451, 0x8893, 0x8894, 0x8895, 0x3452,
+ 0x8896, 0x3453, 0x8897, 0x8898, 0x8899, 0x889a, 0x889b, 0x3454,
+ 0x3455, 0x889c, 0x3456, 0x889d, 0x3457, 0x889e, 0x889f, 0x88a0,
+ 0x88a1, 0x3458, 0x88a2, 0x3459, 0x345a, 0x345b, 0x88a3, 0x345c,
+ 0x88a4, 0x88a5, 0x345d, 0x345e, 0x345f, 0x3460, 0x3461, 0x88a6,
+ 0x88a7, 0x88a8, 0x3462, 0x3463, 0x3464, 0x88a9, 0x3465, 0x3466,
+ 0x3467, 0x3468, 0x3469, 0x88aa, 0x88ab, 0x88ac, 0x346a, 0x346b,
+ 0x346c, 0x88ad, 0x88ae, 0x346d, 0x88af, 0x88b0, 0x88b1, 0x346e,
+ 0x88b2, 0x88b3, 0x88b4, 0x88b5, 0x88b6, 0x88b7, 0x88b8, 0x346f,
+ 0x3470, 0x88b9, 0x3471, 0x3472, 0x3473, 0x88ba, 0x88bb, 0x88bc,
+ 0x88bd, 0x88be, 0x88bf, 0x3474, 0x88c0, 0x88c1, 0x88c2, 0x88c3,
+ 0x88c4, 0x88c5, 0x88c6, 0x88c7, 0x88c8, 0x88c9, 0x88ca, 0x88cb,
+ 0x88cc, 0x88cd, 0x88ce, 0x88cf, 0x88d0, 0x88d1, 0x88d2, 0x88d3,
+ 0x88d4, 0x88d5, 0x88d6, 0x88d7, 0x88d8, 0x88d9, 0x88da, 0x88db,
+ 0x88dc, 0x88dd, 0x88de, 0x88df, 0x88e0, 0x88e1, 0x88e2, 0x88e3,
+ 0x88e4, 0x88e5, 0x88e6, 0x88e7, 0x88e8, 0x88e9, 0x88ea, 0x88eb,
+ 0x88ec, 0x88ed, 0x88ee, 0x88ef, 0x88f0, 0x88f1, 0x88f2, 0x88f3,
+ 0x88f4, 0x88f5, 0x88f6, 0x3475, 0x3476, 0x3477, 0x88f7, 0x3478,
+ 0x88f8, 0x88f9, 0x3479, 0x347a, 0x88fa, 0x347b, 0x347c, 0x88fb,
+ 0x88fc, 0x88fd, 0x88fe, 0x347d, 0x347e, 0x8941, 0x3521, 0x8942,
0x3522, 0x8943, 0x3523, 0x8944, 0x8945, 0x3524, 0x8946, 0x3525,
0x3526, 0x8947, 0x8948, 0x3527, 0x8949, 0x894a, 0x894b, 0x3528,
0x894c, 0x894d, 0x894e, 0x894f, 0x8950, 0x8951, 0x8952, 0x3529,
@@ -2931,26 +2931,26 @@
0x8963, 0x8964, 0x8965, 0x3530, 0x8966, 0x8967, 0x8968, 0x8969,
0x896a, 0x896b, 0x896c, 0x896d, 0x896e, 0x896f, 0x8970, 0x3531,
0x3532, 0x8971, 0x8972, 0x8973, 0x8974, 0x8975, 0x8976, 0x3533,
- 0x8977, 0x8978, 0x8979, 0x3534, 0x897a, 0x8901, 0x8902, 0x8903,
- 0x8904, 0x8905, 0x8906, 0x8907, 0x8908, 0x8909, 0x890a, 0x890b,
- 0x890c, 0x890d, 0x890e, 0x890f, 0x8910, 0x8911, 0x8912, 0x8913,
- 0x8914, 0x8915, 0x8916, 0x3535, 0x3536, 0x8917, 0x8918, 0x3537,
- 0x8919, 0x891a, 0x3538, 0x3539, 0x891b, 0x353a, 0x891c, 0x353b,
- 0x891d, 0x891e, 0x891f, 0x353c, 0x353d, 0x8920, 0x353e, 0x8921,
- 0x353f, 0x8922, 0x3540, 0x8923, 0x3541, 0x8924, 0x8925, 0x3542,
- 0x8926, 0x8927, 0x8928, 0x3543, 0x8929, 0x892a, 0x892b, 0x3544,
- 0x892c, 0x892d, 0x892e, 0x892f, 0x8930, 0x8931, 0x8932, 0x8933,
- 0x8934, 0x8935, 0x8936, 0x8937, 0x8938, 0x8939, 0x893a, 0x893b,
- 0x893c, 0x893d, 0x893e, 0x3545, 0x893f, 0x8940, 0x8941, 0x8942,
- 0x8943, 0x8944, 0x8945, 0x8946, 0x8947, 0x8948, 0x8949, 0x894a,
- 0x894b, 0x894c, 0x894d, 0x894e, 0x894f, 0x8950, 0x8951, 0x3546,
- 0x8952, 0x8953, 0x8954, 0x8955, 0x8956, 0x8957, 0x8958, 0x3547,
- 0x8959, 0x895a, 0x895b, 0x3548, 0x895c, 0x895d, 0x895e, 0x3549,
- 0x895f, 0x8960, 0x8961, 0x8962, 0x8963, 0x8964, 0x8965, 0x354a,
- 0x354b, 0x8966, 0x354c, 0x8967, 0x8968, 0x8969, 0x896a, 0x896b,
- 0x896c, 0x896d, 0x896e, 0x354d, 0x896f, 0x8970, 0x8971, 0x8972,
- 0x8973, 0x8974, 0x8975, 0x8976, 0x8977, 0x8978, 0x8979, 0x897a,
- 0x897b, 0x897c, 0x897d, 0x897e, 0x8a41, 0x8a42, 0x8a43, 0x8a44,
+ 0x8977, 0x8978, 0x8979, 0x3534, 0x897a, 0x8981, 0x8982, 0x8983,
+ 0x8984, 0x8985, 0x8986, 0x8987, 0x8988, 0x8989, 0x898a, 0x898b,
+ 0x898c, 0x898d, 0x898e, 0x898f, 0x8990, 0x8991, 0x8992, 0x8993,
+ 0x8994, 0x8995, 0x8996, 0x3535, 0x3536, 0x8997, 0x8998, 0x3537,
+ 0x8999, 0x899a, 0x3538, 0x3539, 0x899b, 0x353a, 0x899c, 0x353b,
+ 0x899d, 0x899e, 0x899f, 0x353c, 0x353d, 0x89a0, 0x353e, 0x89a1,
+ 0x353f, 0x89a2, 0x3540, 0x89a3, 0x3541, 0x89a4, 0x89a5, 0x3542,
+ 0x89a6, 0x89a7, 0x89a8, 0x3543, 0x89a9, 0x89aa, 0x89ab, 0x3544,
+ 0x89ac, 0x89ad, 0x89ae, 0x89af, 0x89b0, 0x89b1, 0x89b2, 0x89b3,
+ 0x89b4, 0x89b5, 0x89b6, 0x89b7, 0x89b8, 0x89b9, 0x89ba, 0x89bb,
+ 0x89bc, 0x89bd, 0x89be, 0x3545, 0x89bf, 0x89c0, 0x89c1, 0x89c2,
+ 0x89c3, 0x89c4, 0x89c5, 0x89c6, 0x89c7, 0x89c8, 0x89c9, 0x89ca,
+ 0x89cb, 0x89cc, 0x89cd, 0x89ce, 0x89cf, 0x89d0, 0x89d1, 0x3546,
+ 0x89d2, 0x89d3, 0x89d4, 0x89d5, 0x89d6, 0x89d7, 0x89d8, 0x3547,
+ 0x89d9, 0x89da, 0x89db, 0x3548, 0x89dc, 0x89dd, 0x89de, 0x3549,
+ 0x89df, 0x89e0, 0x89e1, 0x89e2, 0x89e3, 0x89e4, 0x89e5, 0x354a,
+ 0x354b, 0x89e6, 0x354c, 0x89e7, 0x89e8, 0x89e9, 0x89ea, 0x89eb,
+ 0x89ec, 0x89ed, 0x89ee, 0x354d, 0x89ef, 0x89f0, 0x89f1, 0x89f2,
+ 0x89f3, 0x89f4, 0x89f5, 0x89f6, 0x89f7, 0x89f8, 0x89f9, 0x89fa,
+ 0x89fb, 0x89fc, 0x89fd, 0x89fe, 0x8a41, 0x8a42, 0x8a43, 0x8a44,
0x8a45, 0x8a46, 0x8a47, 0x8a48, 0x8a49, 0x8a4a, 0x8a4b, 0x354e,
0x354f, 0x8a4c, 0x8a4d, 0x3550, 0x8a4e, 0x8a4f, 0x8a50, 0x3551,
0x8a51, 0x8a52, 0x8a53, 0x8a54, 0x8a55, 0x8a56, 0x8a57, 0x3552,
@@ -2958,26 +2958,26 @@
0x8a63, 0x8a64, 0x8a65, 0x3556, 0x8a66, 0x8a67, 0x8a68, 0x8a69,
0x8a6a, 0x8a6b, 0x8a6c, 0x8a6d, 0x8a6e, 0x8a6f, 0x8a70, 0x8a71,
0x8a72, 0x8a73, 0x8a74, 0x8a75, 0x8a76, 0x8a77, 0x8a78, 0x3557,
- 0x8a79, 0x8a7a, 0x8a01, 0x8a02, 0x8a03, 0x8a04, 0x8a05, 0x3558,
- 0x8a06, 0x8a07, 0x8a08, 0x8a09, 0x8a0a, 0x8a0b, 0x8a0c, 0x8a0d,
- 0x8a0e, 0x8a0f, 0x8a10, 0x8a11, 0x8a12, 0x8a13, 0x8a14, 0x8a15,
- 0x8a16, 0x8a17, 0x8a18, 0x8a19, 0x3559, 0x8a1a, 0x8a1b, 0x8a1c,
- 0x8a1d, 0x8a1e, 0x8a1f, 0x355a, 0x8a20, 0x8a21, 0x8a22, 0x355b,
- 0x8a23, 0x8a24, 0x8a25, 0x355c, 0x8a26, 0x8a27, 0x8a28, 0x8a29,
- 0x8a2a, 0x8a2b, 0x8a2c, 0x8a2d, 0x355d, 0x8a2e, 0x355e, 0x8a2f,
- 0x355f, 0x8a30, 0x8a31, 0x8a32, 0x8a33, 0x8a34, 0x8a35, 0x3560,
- 0x8a36, 0x8a37, 0x8a38, 0x3561, 0x8a39, 0x8a3a, 0x8a3b, 0x3562,
- 0x8a3c, 0x8a3d, 0x8a3e, 0x8a3f, 0x8a40, 0x8a41, 0x8a42, 0x3563,
- 0x8a43, 0x8a44, 0x8a45, 0x8a46, 0x3564, 0x8a47, 0x8a48, 0x8a49,
- 0x8a4a, 0x8a4b, 0x8a4c, 0x3565, 0x3566, 0x8a4d, 0x8a4e, 0x3567,
- 0x8a4f, 0x8a50, 0x3568, 0x3569, 0x8a51, 0x356a, 0x8a52, 0x8a53,
- 0x8a54, 0x8a55, 0x8a56, 0x356b, 0x356c, 0x8a57, 0x356d, 0x8a58,
- 0x356e, 0x8a59, 0x8a5a, 0x8a5b, 0x8a5c, 0x8a5d, 0x8a5e, 0x356f,
- 0x8a5f, 0x8a60, 0x8a61, 0x8a62, 0x8a63, 0x8a64, 0x8a65, 0x8a66,
- 0x8a67, 0x8a68, 0x8a69, 0x8a6a, 0x8a6b, 0x8a6c, 0x8a6d, 0x8a6e,
- 0x8a6f, 0x8a70, 0x8a71, 0x8a72, 0x8a73, 0x8a74, 0x8a75, 0x8a76,
- 0x8a77, 0x8a78, 0x8a79, 0x3570, 0x3571, 0x8a7a, 0x8a7b, 0x3572,
- 0x8a7c, 0x8a7d, 0x3573, 0x3574, 0x8a7e, 0x8b41, 0x8b42, 0x8b43,
+ 0x8a79, 0x8a7a, 0x8a81, 0x8a82, 0x8a83, 0x8a84, 0x8a85, 0x3558,
+ 0x8a86, 0x8a87, 0x8a88, 0x8a89, 0x8a8a, 0x8a8b, 0x8a8c, 0x8a8d,
+ 0x8a8e, 0x8a8f, 0x8a90, 0x8a91, 0x8a92, 0x8a93, 0x8a94, 0x8a95,
+ 0x8a96, 0x8a97, 0x8a98, 0x8a99, 0x3559, 0x8a9a, 0x8a9b, 0x8a9c,
+ 0x8a9d, 0x8a9e, 0x8a9f, 0x355a, 0x8aa0, 0x8aa1, 0x8aa2, 0x355b,
+ 0x8aa3, 0x8aa4, 0x8aa5, 0x355c, 0x8aa6, 0x8aa7, 0x8aa8, 0x8aa9,
+ 0x8aaa, 0x8aab, 0x8aac, 0x8aad, 0x355d, 0x8aae, 0x355e, 0x8aaf,
+ 0x355f, 0x8ab0, 0x8ab1, 0x8ab2, 0x8ab3, 0x8ab4, 0x8ab5, 0x3560,
+ 0x8ab6, 0x8ab7, 0x8ab8, 0x3561, 0x8ab9, 0x8aba, 0x8abb, 0x3562,
+ 0x8abc, 0x8abd, 0x8abe, 0x8abf, 0x8ac0, 0x8ac1, 0x8ac2, 0x3563,
+ 0x8ac3, 0x8ac4, 0x8ac5, 0x8ac6, 0x3564, 0x8ac7, 0x8ac8, 0x8ac9,
+ 0x8aca, 0x8acb, 0x8acc, 0x3565, 0x3566, 0x8acd, 0x8ace, 0x3567,
+ 0x8acf, 0x8ad0, 0x3568, 0x3569, 0x8ad1, 0x356a, 0x8ad2, 0x8ad3,
+ 0x8ad4, 0x8ad5, 0x8ad6, 0x356b, 0x356c, 0x8ad7, 0x356d, 0x8ad8,
+ 0x356e, 0x8ad9, 0x8ada, 0x8adb, 0x8adc, 0x8add, 0x8ade, 0x356f,
+ 0x8adf, 0x8ae0, 0x8ae1, 0x8ae2, 0x8ae3, 0x8ae4, 0x8ae5, 0x8ae6,
+ 0x8ae7, 0x8ae8, 0x8ae9, 0x8aea, 0x8aeb, 0x8aec, 0x8aed, 0x8aee,
+ 0x8aef, 0x8af0, 0x8af1, 0x8af2, 0x8af3, 0x8af4, 0x8af5, 0x8af6,
+ 0x8af7, 0x8af8, 0x8af9, 0x3570, 0x3571, 0x8afa, 0x8afb, 0x3572,
+ 0x8afc, 0x8afd, 0x3573, 0x3574, 0x8afe, 0x8b41, 0x8b42, 0x8b43,
0x8b44, 0x8b45, 0x8b46, 0x3575, 0x3576, 0x8b47, 0x3577, 0x3578,
0x3579, 0x357a, 0x8b48, 0x8b49, 0x8b4a, 0x8b4b, 0x8b4c, 0x357b,
0x357c, 0x8b4d, 0x8b4e, 0x357d, 0x8b4f, 0x8b50, 0x8b51, 0x357e,
@@ -2987,25 +2987,25 @@
0x8b67, 0x8b68, 0x8b69, 0x362a, 0x8b6a, 0x8b6b, 0x8b6c, 0x8b6d,
0x8b6e, 0x8b6f, 0x8b70, 0x362b, 0x362c, 0x8b71, 0x362d, 0x362e,
0x362f, 0x8b72, 0x8b73, 0x8b74, 0x8b75, 0x8b76, 0x8b77, 0x8b78,
- 0x8b79, 0x8b7a, 0x8b01, 0x8b02, 0x8b03, 0x8b04, 0x8b05, 0x8b06,
- 0x8b07, 0x8b08, 0x8b09, 0x8b0a, 0x8b0b, 0x8b0c, 0x8b0d, 0x8b0e,
- 0x8b0f, 0x8b10, 0x8b11, 0x8b12, 0x8b13, 0x8b14, 0x8b15, 0x8b16,
- 0x8b17, 0x8b18, 0x8b19, 0x8b1a, 0x8b1b, 0x8b1c, 0x8b1d, 0x8b1e,
- 0x8b1f, 0x8b20, 0x8b21, 0x8b22, 0x8b23, 0x8b24, 0x8b25, 0x8b26,
- 0x8b27, 0x8b28, 0x8b29, 0x8b2a, 0x8b2b, 0x8b2c, 0x8b2d, 0x8b2e,
- 0x8b2f, 0x8b30, 0x8b31, 0x8b32, 0x8b33, 0x8b34, 0x8b35, 0x3630,
- 0x3631, 0x8b36, 0x8b37, 0x3632, 0x8b38, 0x8b39, 0x8b3a, 0x3633,
- 0x8b3b, 0x3634, 0x3635, 0x8b3c, 0x8b3d, 0x8b3e, 0x8b3f, 0x3636,
- 0x3637, 0x8b40, 0x3638, 0x3639, 0x363a, 0x8b41, 0x8b42, 0x8b43,
- 0x8b44, 0x8b45, 0x363b, 0x363c, 0x363d, 0x8b46, 0x8b47, 0x363e,
- 0x8b48, 0x8b49, 0x8b4a, 0x363f, 0x8b4b, 0x8b4c, 0x8b4d, 0x8b4e,
- 0x8b4f, 0x8b50, 0x8b51, 0x3640, 0x3641, 0x8b52, 0x3642, 0x3643,
- 0x3644, 0x8b53, 0x8b54, 0x8b55, 0x8b56, 0x8b57, 0x8b58, 0x3645,
- 0x8b59, 0x8b5a, 0x8b5b, 0x8b5c, 0x8b5d, 0x8b5e, 0x8b5f, 0x8b60,
- 0x8b61, 0x8b62, 0x8b63, 0x8b64, 0x8b65, 0x8b66, 0x8b67, 0x8b68,
- 0x8b69, 0x8b6a, 0x8b6b, 0x3646, 0x8b6c, 0x8b6d, 0x8b6e, 0x8b6f,
- 0x8b70, 0x8b71, 0x8b72, 0x8b73, 0x8b74, 0x8b75, 0x8b76, 0x8b77,
- 0x8b78, 0x8b79, 0x8b7a, 0x8b7b, 0x8b7c, 0x8b7d, 0x8b7e, 0x8c41,
+ 0x8b79, 0x8b7a, 0x8b81, 0x8b82, 0x8b83, 0x8b84, 0x8b85, 0x8b86,
+ 0x8b87, 0x8b88, 0x8b89, 0x8b8a, 0x8b8b, 0x8b8c, 0x8b8d, 0x8b8e,
+ 0x8b8f, 0x8b90, 0x8b91, 0x8b92, 0x8b93, 0x8b94, 0x8b95, 0x8b96,
+ 0x8b97, 0x8b98, 0x8b99, 0x8b9a, 0x8b9b, 0x8b9c, 0x8b9d, 0x8b9e,
+ 0x8b9f, 0x8ba0, 0x8ba1, 0x8ba2, 0x8ba3, 0x8ba4, 0x8ba5, 0x8ba6,
+ 0x8ba7, 0x8ba8, 0x8ba9, 0x8baa, 0x8bab, 0x8bac, 0x8bad, 0x8bae,
+ 0x8baf, 0x8bb0, 0x8bb1, 0x8bb2, 0x8bb3, 0x8bb4, 0x8bb5, 0x3630,
+ 0x3631, 0x8bb6, 0x8bb7, 0x3632, 0x8bb8, 0x8bb9, 0x8bba, 0x3633,
+ 0x8bbb, 0x3634, 0x3635, 0x8bbc, 0x8bbd, 0x8bbe, 0x8bbf, 0x3636,
+ 0x3637, 0x8bc0, 0x3638, 0x3639, 0x363a, 0x8bc1, 0x8bc2, 0x8bc3,
+ 0x8bc4, 0x8bc5, 0x363b, 0x363c, 0x363d, 0x8bc6, 0x8bc7, 0x363e,
+ 0x8bc8, 0x8bc9, 0x8bca, 0x363f, 0x8bcb, 0x8bcc, 0x8bcd, 0x8bce,
+ 0x8bcf, 0x8bd0, 0x8bd1, 0x3640, 0x3641, 0x8bd2, 0x3642, 0x3643,
+ 0x3644, 0x8bd3, 0x8bd4, 0x8bd5, 0x8bd6, 0x8bd7, 0x8bd8, 0x3645,
+ 0x8bd9, 0x8bda, 0x8bdb, 0x8bdc, 0x8bdd, 0x8bde, 0x8bdf, 0x8be0,
+ 0x8be1, 0x8be2, 0x8be3, 0x8be4, 0x8be5, 0x8be6, 0x8be7, 0x8be8,
+ 0x8be9, 0x8bea, 0x8beb, 0x3646, 0x8bec, 0x8bed, 0x8bee, 0x8bef,
+ 0x8bf0, 0x8bf1, 0x8bf2, 0x8bf3, 0x8bf4, 0x8bf5, 0x8bf6, 0x8bf7,
+ 0x8bf8, 0x8bf9, 0x8bfa, 0x8bfb, 0x8bfc, 0x8bfd, 0x8bfe, 0x8c41,
0x8c42, 0x8c43, 0x8c44, 0x8c45, 0x8c46, 0x8c47, 0x8c48, 0x8c49,
0x8c4a, 0x8c4b, 0x8c4c, 0x8c4d, 0x8c4e, 0x8c4f, 0x8c50, 0x3647,
0x3648, 0x8c51, 0x8c52, 0x3649, 0x8c53, 0x8c54, 0x8c55, 0x364a,
@@ -3013,51 +3013,51 @@
0x8c64, 0x8c65, 0x8c66, 0x8c67, 0x364b, 0x8c68, 0x8c69, 0x8c6a,
0x8c6b, 0x8c6c, 0x8c6d, 0x364c, 0x8c6e, 0x8c6f, 0x8c70, 0x8c71,
0x8c72, 0x8c73, 0x8c74, 0x364d, 0x8c75, 0x8c76, 0x8c77, 0x8c78,
- 0x8c79, 0x8c7a, 0x8c01, 0x8c02, 0x8c03, 0x8c04, 0x8c05, 0x8c06,
- 0x8c07, 0x8c08, 0x8c09, 0x8c0a, 0x8c0b, 0x8c0c, 0x8c0d, 0x364e,
- 0x8c0e, 0x8c0f, 0x8c10, 0x8c11, 0x8c12, 0x8c13, 0x8c14, 0x8c15,
- 0x8c16, 0x8c17, 0x8c18, 0x8c19, 0x8c1a, 0x8c1b, 0x8c1c, 0x8c1d,
- 0x8c1e, 0x8c1f, 0x8c20, 0x8c21, 0x8c22, 0x8c23, 0x8c24, 0x8c25,
- 0x8c26, 0x8c27, 0x8c28, 0x364f, 0x8c29, 0x8c2a, 0x8c2b, 0x3650,
- 0x8c2c, 0x8c2d, 0x8c2e, 0x8c2f, 0x8c30, 0x8c31, 0x8c32, 0x8c33,
- 0x8c34, 0x8c35, 0x8c36, 0x8c37, 0x8c38, 0x8c39, 0x8c3a, 0x8c3b,
- 0x8c3c, 0x8c3d, 0x8c3e, 0x8c3f, 0x8c40, 0x8c41, 0x8c42, 0x8c43,
- 0x8c44, 0x8c45, 0x8c46, 0x8c47, 0x8c48, 0x8c49, 0x8c4a, 0x8c4b,
- 0x8c4c, 0x8c4d, 0x8c4e, 0x8c4f, 0x8c50, 0x8c51, 0x8c52, 0x8c53,
- 0x8c54, 0x8c55, 0x8c56, 0x8c57, 0x8c58, 0x8c59, 0x8c5a, 0x8c5b,
- 0x8c5c, 0x8c5d, 0x8c5e, 0x3651, 0x3652, 0x8c5f, 0x8c60, 0x3653,
- 0x8c61, 0x8c62, 0x8c63, 0x3654, 0x8c64, 0x8c65, 0x8c66, 0x8c67,
- 0x8c68, 0x8c69, 0x3655, 0x3656, 0x8c6a, 0x8c6b, 0x8c6c, 0x8c6d,
- 0x3657, 0x8c6e, 0x8c6f, 0x8c70, 0x8c71, 0x8c72, 0x8c73, 0x8c74,
- 0x8c75, 0x8c76, 0x8c77, 0x8c78, 0x8c79, 0x8c7a, 0x8c7b, 0x8c7c,
- 0x8c7d, 0x8c7e, 0x8d41, 0x8d42, 0x8d43, 0x8d44, 0x8d45, 0x8d46,
+ 0x8c79, 0x8c7a, 0x8c81, 0x8c82, 0x8c83, 0x8c84, 0x8c85, 0x8c86,
+ 0x8c87, 0x8c88, 0x8c89, 0x8c8a, 0x8c8b, 0x8c8c, 0x8c8d, 0x364e,
+ 0x8c8e, 0x8c8f, 0x8c90, 0x8c91, 0x8c92, 0x8c93, 0x8c94, 0x8c95,
+ 0x8c96, 0x8c97, 0x8c98, 0x8c99, 0x8c9a, 0x8c9b, 0x8c9c, 0x8c9d,
+ 0x8c9e, 0x8c9f, 0x8ca0, 0x8ca1, 0x8ca2, 0x8ca3, 0x8ca4, 0x8ca5,
+ 0x8ca6, 0x8ca7, 0x8ca8, 0x364f, 0x8ca9, 0x8caa, 0x8cab, 0x3650,
+ 0x8cac, 0x8cad, 0x8cae, 0x8caf, 0x8cb0, 0x8cb1, 0x8cb2, 0x8cb3,
+ 0x8cb4, 0x8cb5, 0x8cb6, 0x8cb7, 0x8cb8, 0x8cb9, 0x8cba, 0x8cbb,
+ 0x8cbc, 0x8cbd, 0x8cbe, 0x8cbf, 0x8cc0, 0x8cc1, 0x8cc2, 0x8cc3,
+ 0x8cc4, 0x8cc5, 0x8cc6, 0x8cc7, 0x8cc8, 0x8cc9, 0x8cca, 0x8ccb,
+ 0x8ccc, 0x8ccd, 0x8cce, 0x8ccf, 0x8cd0, 0x8cd1, 0x8cd2, 0x8cd3,
+ 0x8cd4, 0x8cd5, 0x8cd6, 0x8cd7, 0x8cd8, 0x8cd9, 0x8cda, 0x8cdb,
+ 0x8cdc, 0x8cdd, 0x8cde, 0x3651, 0x3652, 0x8cdf, 0x8ce0, 0x3653,
+ 0x8ce1, 0x8ce2, 0x8ce3, 0x3654, 0x8ce4, 0x8ce5, 0x8ce6, 0x8ce7,
+ 0x8ce8, 0x8ce9, 0x3655, 0x3656, 0x8cea, 0x8ceb, 0x8cec, 0x8ced,
+ 0x3657, 0x8cee, 0x8cef, 0x8cf0, 0x8cf1, 0x8cf2, 0x8cf3, 0x8cf4,
+ 0x8cf5, 0x8cf6, 0x8cf7, 0x8cf8, 0x8cf9, 0x8cfa, 0x8cfb, 0x8cfc,
+ 0x8cfd, 0x8cfe, 0x8d41, 0x8d42, 0x8d43, 0x8d44, 0x8d45, 0x8d46,
0x8d47, 0x8d48, 0x8d49, 0x8d4a, 0x8d4b, 0x8d4c, 0x8d4d, 0x8d4e,
0x8d4f, 0x8d50, 0x8d51, 0x3658, 0x8d52, 0x8d53, 0x8d54, 0x8d55,
0x8d56, 0x8d57, 0x8d58, 0x8d59, 0x8d5a, 0x8d61, 0x8d62, 0x8d63,
0x8d64, 0x8d65, 0x8d66, 0x8d67, 0x8d68, 0x8d69, 0x8d6a, 0x8d6b,
0x8d6c, 0x8d6d, 0x8d6e, 0x8d6f, 0x8d70, 0x8d71, 0x8d72, 0x3659,
0x8d73, 0x8d74, 0x8d75, 0x365a, 0x8d76, 0x8d77, 0x8d78, 0x365b,
- 0x8d79, 0x8d7a, 0x8d01, 0x8d02, 0x8d03, 0x8d04, 0x8d05, 0x365c,
- 0x365d, 0x8d06, 0x8d07, 0x8d08, 0x365e, 0x8d09, 0x8d0a, 0x8d0b,
- 0x8d0c, 0x8d0d, 0x8d0e, 0x8d0f, 0x8d10, 0x8d11, 0x8d12, 0x8d13,
- 0x8d14, 0x8d15, 0x8d16, 0x8d17, 0x8d18, 0x8d19, 0x8d1a, 0x8d1b,
- 0x8d1c, 0x8d1d, 0x8d1e, 0x8d1f, 0x8d20, 0x8d21, 0x8d22, 0x8d23,
- 0x8d24, 0x8d25, 0x8d26, 0x8d27, 0x8d28, 0x8d29, 0x8d2a, 0x365f,
- 0x3660, 0x8d2b, 0x8d2c, 0x3661, 0x8d2d, 0x8d2e, 0x3662, 0x3663,
- 0x8d2f, 0x8d30, 0x8d31, 0x8d32, 0x8d33, 0x8d34, 0x8d35, 0x3664,
- 0x3665, 0x8d36, 0x3666, 0x8d37, 0x8d38, 0x8d39, 0x8d3a, 0x8d3b,
- 0x8d3c, 0x8d3d, 0x8d3e, 0x3667, 0x8d3f, 0x8d40, 0x8d41, 0x3668,
- 0x8d42, 0x8d43, 0x8d44, 0x3669, 0x8d45, 0x8d46, 0x8d47, 0x8d48,
- 0x8d49, 0x8d4a, 0x8d4b, 0x366a, 0x366b, 0x8d4c, 0x8d4d, 0x8d4e,
- 0x8d4f, 0x8d50, 0x8d51, 0x8d52, 0x8d53, 0x8d54, 0x8d55, 0x366c,
- 0x8d56, 0x8d57, 0x8d58, 0x366d, 0x8d59, 0x8d5a, 0x8d5b, 0x366e,
- 0x8d5c, 0x8d5d, 0x8d5e, 0x8d5f, 0x8d60, 0x8d61, 0x8d62, 0x366f,
- 0x3670, 0x8d63, 0x3671, 0x8d64, 0x3672, 0x8d65, 0x8d66, 0x8d67,
- 0x8d68, 0x8d69, 0x8d6a, 0x3673, 0x3674, 0x8d6b, 0x8d6c, 0x3675,
- 0x8d6d, 0x8d6e, 0x8d6f, 0x3676, 0x8d70, 0x8d71, 0x8d72, 0x8d73,
- 0x8d74, 0x8d75, 0x8d76, 0x3677, 0x3678, 0x8d77, 0x3679, 0x367a,
- 0x367b, 0x367c, 0x8d78, 0x8d79, 0x8d7a, 0x367d, 0x367e, 0x3721,
- 0x3722, 0x8d7b, 0x8d7c, 0x3723, 0x8d7d, 0x8d7e, 0x8e41, 0x3724,
+ 0x8d79, 0x8d7a, 0x8d81, 0x8d82, 0x8d83, 0x8d84, 0x8d85, 0x365c,
+ 0x365d, 0x8d86, 0x8d87, 0x8d88, 0x365e, 0x8d89, 0x8d8a, 0x8d8b,
+ 0x8d8c, 0x8d8d, 0x8d8e, 0x8d8f, 0x8d90, 0x8d91, 0x8d92, 0x8d93,
+ 0x8d94, 0x8d95, 0x8d96, 0x8d97, 0x8d98, 0x8d99, 0x8d9a, 0x8d9b,
+ 0x8d9c, 0x8d9d, 0x8d9e, 0x8d9f, 0x8da0, 0x8da1, 0x8da2, 0x8da3,
+ 0x8da4, 0x8da5, 0x8da6, 0x8da7, 0x8da8, 0x8da9, 0x8daa, 0x365f,
+ 0x3660, 0x8dab, 0x8dac, 0x3661, 0x8dad, 0x8dae, 0x3662, 0x3663,
+ 0x8daf, 0x8db0, 0x8db1, 0x8db2, 0x8db3, 0x8db4, 0x8db5, 0x3664,
+ 0x3665, 0x8db6, 0x3666, 0x8db7, 0x8db8, 0x8db9, 0x8dba, 0x8dbb,
+ 0x8dbc, 0x8dbd, 0x8dbe, 0x3667, 0x8dbf, 0x8dc0, 0x8dc1, 0x3668,
+ 0x8dc2, 0x8dc3, 0x8dc4, 0x3669, 0x8dc5, 0x8dc6, 0x8dc7, 0x8dc8,
+ 0x8dc9, 0x8dca, 0x8dcb, 0x366a, 0x366b, 0x8dcc, 0x8dcd, 0x8dce,
+ 0x8dcf, 0x8dd0, 0x8dd1, 0x8dd2, 0x8dd3, 0x8dd4, 0x8dd5, 0x366c,
+ 0x8dd6, 0x8dd7, 0x8dd8, 0x366d, 0x8dd9, 0x8dda, 0x8ddb, 0x366e,
+ 0x8ddc, 0x8ddd, 0x8dde, 0x8ddf, 0x8de0, 0x8de1, 0x8de2, 0x366f,
+ 0x3670, 0x8de3, 0x3671, 0x8de4, 0x3672, 0x8de5, 0x8de6, 0x8de7,
+ 0x8de8, 0x8de9, 0x8dea, 0x3673, 0x3674, 0x8deb, 0x8dec, 0x3675,
+ 0x8ded, 0x8dee, 0x8def, 0x3676, 0x8df0, 0x8df1, 0x8df2, 0x8df3,
+ 0x8df4, 0x8df5, 0x8df6, 0x3677, 0x3678, 0x8df7, 0x3679, 0x367a,
+ 0x367b, 0x367c, 0x8df8, 0x8df9, 0x8dfa, 0x367d, 0x367e, 0x3721,
+ 0x3722, 0x8dfb, 0x8dfc, 0x3723, 0x8dfd, 0x8dfe, 0x8e41, 0x3724,
0x8e42, 0x8e43, 0x8e44, 0x8e45, 0x8e46, 0x8e47, 0x8e48, 0x3725,
0x3726, 0x8e49, 0x3727, 0x3728, 0x3729, 0x8e4a, 0x8e4b, 0x8e4c,
0x8e4d, 0x8e4e, 0x8e4f, 0x372a, 0x372b, 0x8e50, 0x8e51, 0x372c,
@@ -3065,54 +3065,54 @@
0x8e5a, 0x8e61, 0x8e62, 0x8e63, 0x8e64, 0x8e65, 0x372d, 0x8e66,
0x372e, 0x8e67, 0x8e68, 0x8e69, 0x8e6a, 0x8e6b, 0x8e6c, 0x8e6d,
0x8e6e, 0x8e6f, 0x8e70, 0x8e71, 0x8e72, 0x8e73, 0x8e74, 0x8e75,
- 0x8e76, 0x8e77, 0x8e78, 0x8e79, 0x8e7a, 0x8e01, 0x8e02, 0x8e03,
- 0x8e04, 0x8e05, 0x8e06, 0x8e07, 0x8e08, 0x8e09, 0x8e0a, 0x8e0b,
- 0x8e0c, 0x8e0d, 0x8e0e, 0x372f, 0x3730, 0x8e0f, 0x8e10, 0x3731,
- 0x8e11, 0x8e12, 0x8e13, 0x3732, 0x8e14, 0x8e15, 0x8e16, 0x8e17,
- 0x8e18, 0x8e19, 0x8e1a, 0x3733, 0x3734, 0x8e1b, 0x3735, 0x3736,
- 0x3737, 0x8e1c, 0x8e1d, 0x8e1e, 0x8e1f, 0x8e20, 0x3738, 0x3739,
- 0x373a, 0x8e21, 0x8e22, 0x373b, 0x8e23, 0x8e24, 0x8e25, 0x373c,
- 0x8e26, 0x8e27, 0x8e28, 0x8e29, 0x8e2a, 0x8e2b, 0x8e2c, 0x373d,
- 0x373e, 0x8e2d, 0x373f, 0x8e2e, 0x3740, 0x8e2f, 0x8e30, 0x8e31,
- 0x8e32, 0x8e33, 0x8e34, 0x3741, 0x3742, 0x8e35, 0x8e36, 0x3743,
- 0x8e37, 0x8e38, 0x8e39, 0x3744, 0x8e3a, 0x8e3b, 0x8e3c, 0x8e3d,
- 0x8e3e, 0x8e3f, 0x8e40, 0x3745, 0x3746, 0x8e41, 0x3747, 0x3748,
- 0x3749, 0x8e42, 0x8e43, 0x8e44, 0x8e45, 0x8e46, 0x8e47, 0x374a,
- 0x8e48, 0x8e49, 0x8e4a, 0x374b, 0x8e4b, 0x8e4c, 0x8e4d, 0x8e4e,
- 0x8e4f, 0x8e50, 0x8e51, 0x8e52, 0x8e53, 0x8e54, 0x8e55, 0x8e56,
- 0x374c, 0x8e57, 0x374d, 0x8e58, 0x8e59, 0x8e5a, 0x8e5b, 0x8e5c,
- 0x8e5d, 0x8e5e, 0x8e5f, 0x374e, 0x374f, 0x8e60, 0x8e61, 0x3750,
- 0x8e62, 0x8e63, 0x8e64, 0x3751, 0x8e65, 0x8e66, 0x8e67, 0x8e68,
- 0x8e69, 0x8e6a, 0x8e6b, 0x3752, 0x3753, 0x8e6c, 0x3754, 0x8e6d,
- 0x3755, 0x8e6e, 0x8e6f, 0x8e70, 0x8e71, 0x8e72, 0x8e73, 0x3756,
- 0x8e74, 0x8e75, 0x8e76, 0x3757, 0x8e77, 0x8e78, 0x8e79, 0x8e7a,
- 0x8e7b, 0x8e7c, 0x8e7d, 0x8e7e, 0x8f41, 0x8f42, 0x8f43, 0x8f44,
+ 0x8e76, 0x8e77, 0x8e78, 0x8e79, 0x8e7a, 0x8e81, 0x8e82, 0x8e83,
+ 0x8e84, 0x8e85, 0x8e86, 0x8e87, 0x8e88, 0x8e89, 0x8e8a, 0x8e8b,
+ 0x8e8c, 0x8e8d, 0x8e8e, 0x372f, 0x3730, 0x8e8f, 0x8e90, 0x3731,
+ 0x8e91, 0x8e92, 0x8e93, 0x3732, 0x8e94, 0x8e95, 0x8e96, 0x8e97,
+ 0x8e98, 0x8e99, 0x8e9a, 0x3733, 0x3734, 0x8e9b, 0x3735, 0x3736,
+ 0x3737, 0x8e9c, 0x8e9d, 0x8e9e, 0x8e9f, 0x8ea0, 0x3738, 0x3739,
+ 0x373a, 0x8ea1, 0x8ea2, 0x373b, 0x8ea3, 0x8ea4, 0x8ea5, 0x373c,
+ 0x8ea6, 0x8ea7, 0x8ea8, 0x8ea9, 0x8eaa, 0x8eab, 0x8eac, 0x373d,
+ 0x373e, 0x8ead, 0x373f, 0x8eae, 0x3740, 0x8eaf, 0x8eb0, 0x8eb1,
+ 0x8eb2, 0x8eb3, 0x8eb4, 0x3741, 0x3742, 0x8eb5, 0x8eb6, 0x3743,
+ 0x8eb7, 0x8eb8, 0x8eb9, 0x3744, 0x8eba, 0x8ebb, 0x8ebc, 0x8ebd,
+ 0x8ebe, 0x8ebf, 0x8ec0, 0x3745, 0x3746, 0x8ec1, 0x3747, 0x3748,
+ 0x3749, 0x8ec2, 0x8ec3, 0x8ec4, 0x8ec5, 0x8ec6, 0x8ec7, 0x374a,
+ 0x8ec8, 0x8ec9, 0x8eca, 0x374b, 0x8ecb, 0x8ecc, 0x8ecd, 0x8ece,
+ 0x8ecf, 0x8ed0, 0x8ed1, 0x8ed2, 0x8ed3, 0x8ed4, 0x8ed5, 0x8ed6,
+ 0x374c, 0x8ed7, 0x374d, 0x8ed8, 0x8ed9, 0x8eda, 0x8edb, 0x8edc,
+ 0x8edd, 0x8ede, 0x8edf, 0x374e, 0x374f, 0x8ee0, 0x8ee1, 0x3750,
+ 0x8ee2, 0x8ee3, 0x8ee4, 0x3751, 0x8ee5, 0x8ee6, 0x8ee7, 0x8ee8,
+ 0x8ee9, 0x8eea, 0x8eeb, 0x3752, 0x3753, 0x8eec, 0x3754, 0x8eed,
+ 0x3755, 0x8eee, 0x8eef, 0x8ef0, 0x8ef1, 0x8ef2, 0x8ef3, 0x3756,
+ 0x8ef4, 0x8ef5, 0x8ef6, 0x3757, 0x8ef7, 0x8ef8, 0x8ef9, 0x8efa,
+ 0x8efb, 0x8efc, 0x8efd, 0x8efe, 0x8f41, 0x8f42, 0x8f43, 0x8f44,
0x8f45, 0x8f46, 0x8f47, 0x8f48, 0x3758, 0x8f49, 0x8f4a, 0x8f4b,
0x8f4c, 0x8f4d, 0x8f4e, 0x8f4f, 0x8f50, 0x8f51, 0x8f52, 0x8f53,
0x8f54, 0x8f55, 0x8f56, 0x8f57, 0x8f58, 0x8f59, 0x8f5a, 0x8f61,
0x8f62, 0x8f63, 0x8f64, 0x8f65, 0x8f66, 0x8f67, 0x8f68, 0x3759,
0x8f69, 0x8f6a, 0x8f6b, 0x8f6c, 0x8f6d, 0x8f6e, 0x8f6f, 0x375a,
0x8f70, 0x8f71, 0x8f72, 0x375b, 0x8f73, 0x8f74, 0x8f75, 0x375c,
- 0x8f76, 0x8f77, 0x8f78, 0x8f79, 0x8f7a, 0x8f01, 0x8f02, 0x375d,
- 0x375e, 0x8f03, 0x375f, 0x8f04, 0x3760, 0x8f05, 0x8f06, 0x8f07,
- 0x8f08, 0x8f09, 0x8f0a, 0x3761, 0x8f0b, 0x8f0c, 0x8f0d, 0x3762,
- 0x8f0e, 0x8f0f, 0x8f10, 0x3763, 0x8f11, 0x8f12, 0x8f13, 0x8f14,
- 0x8f15, 0x8f16, 0x8f17, 0x8f18, 0x3764, 0x8f19, 0x3765, 0x8f1a,
- 0x3766, 0x8f1b, 0x8f1c, 0x8f1d, 0x8f1e, 0x8f1f, 0x8f20, 0x3767,
- 0x3768, 0x8f21, 0x8f22, 0x3769, 0x8f23, 0x8f24, 0x8f25, 0x376a,
- 0x8f26, 0x8f27, 0x8f28, 0x8f29, 0x8f2a, 0x8f2b, 0x8f2c, 0x376b,
- 0x376c, 0x8f2d, 0x376d, 0x8f2e, 0x376e, 0x8f2f, 0x8f30, 0x8f31,
- 0x8f32, 0x8f33, 0x8f34, 0x376f, 0x8f35, 0x8f36, 0x8f37, 0x8f38,
- 0x8f39, 0x8f3a, 0x8f3b, 0x8f3c, 0x8f3d, 0x8f3e, 0x8f3f, 0x8f40,
- 0x8f41, 0x8f42, 0x8f43, 0x8f44, 0x8f45, 0x8f46, 0x8f47, 0x3770,
- 0x8f48, 0x8f49, 0x8f4a, 0x8f4b, 0x8f4c, 0x8f4d, 0x8f4e, 0x3771,
- 0x8f4f, 0x8f50, 0x8f51, 0x8f52, 0x8f53, 0x8f54, 0x8f55, 0x8f56,
- 0x8f57, 0x8f58, 0x8f59, 0x8f5a, 0x8f5b, 0x8f5c, 0x8f5d, 0x8f5e,
- 0x8f5f, 0x8f60, 0x8f61, 0x8f62, 0x8f63, 0x8f64, 0x8f65, 0x8f66,
- 0x8f67, 0x8f68, 0x8f69, 0x3772, 0x3773, 0x8f6a, 0x8f6b, 0x3774,
- 0x8f6c, 0x8f6d, 0x8f6e, 0x3775, 0x8f6f, 0x8f70, 0x8f71, 0x8f72,
- 0x8f73, 0x8f74, 0x8f75, 0x3776, 0x8f76, 0x8f77, 0x3777, 0x8f78,
- 0x3778, 0x8f79, 0x8f7a, 0x8f7b, 0x8f7c, 0x8f7d, 0x8f7e, 0x3779,
+ 0x8f76, 0x8f77, 0x8f78, 0x8f79, 0x8f7a, 0x8f81, 0x8f82, 0x375d,
+ 0x375e, 0x8f83, 0x375f, 0x8f84, 0x3760, 0x8f85, 0x8f86, 0x8f87,
+ 0x8f88, 0x8f89, 0x8f8a, 0x3761, 0x8f8b, 0x8f8c, 0x8f8d, 0x3762,
+ 0x8f8e, 0x8f8f, 0x8f90, 0x3763, 0x8f91, 0x8f92, 0x8f93, 0x8f94,
+ 0x8f95, 0x8f96, 0x8f97, 0x8f98, 0x3764, 0x8f99, 0x3765, 0x8f9a,
+ 0x3766, 0x8f9b, 0x8f9c, 0x8f9d, 0x8f9e, 0x8f9f, 0x8fa0, 0x3767,
+ 0x3768, 0x8fa1, 0x8fa2, 0x3769, 0x8fa3, 0x8fa4, 0x8fa5, 0x376a,
+ 0x8fa6, 0x8fa7, 0x8fa8, 0x8fa9, 0x8faa, 0x8fab, 0x8fac, 0x376b,
+ 0x376c, 0x8fad, 0x376d, 0x8fae, 0x376e, 0x8faf, 0x8fb0, 0x8fb1,
+ 0x8fb2, 0x8fb3, 0x8fb4, 0x376f, 0x8fb5, 0x8fb6, 0x8fb7, 0x8fb8,
+ 0x8fb9, 0x8fba, 0x8fbb, 0x8fbc, 0x8fbd, 0x8fbe, 0x8fbf, 0x8fc0,
+ 0x8fc1, 0x8fc2, 0x8fc3, 0x8fc4, 0x8fc5, 0x8fc6, 0x8fc7, 0x3770,
+ 0x8fc8, 0x8fc9, 0x8fca, 0x8fcb, 0x8fcc, 0x8fcd, 0x8fce, 0x3771,
+ 0x8fcf, 0x8fd0, 0x8fd1, 0x8fd2, 0x8fd3, 0x8fd4, 0x8fd5, 0x8fd6,
+ 0x8fd7, 0x8fd8, 0x8fd9, 0x8fda, 0x8fdb, 0x8fdc, 0x8fdd, 0x8fde,
+ 0x8fdf, 0x8fe0, 0x8fe1, 0x8fe2, 0x8fe3, 0x8fe4, 0x8fe5, 0x8fe6,
+ 0x8fe7, 0x8fe8, 0x8fe9, 0x3772, 0x3773, 0x8fea, 0x8feb, 0x3774,
+ 0x8fec, 0x8fed, 0x8fee, 0x3775, 0x8fef, 0x8ff0, 0x8ff1, 0x8ff2,
+ 0x8ff3, 0x8ff4, 0x8ff5, 0x3776, 0x8ff6, 0x8ff7, 0x3777, 0x8ff8,
+ 0x3778, 0x8ff9, 0x8ffa, 0x8ffb, 0x8ffc, 0x8ffd, 0x8ffe, 0x3779,
0x377a, 0x9041, 0x9042, 0x377b, 0x9043, 0x9044, 0x9045, 0x377c,
0x9046, 0x9047, 0x9048, 0x9049, 0x904a, 0x904b, 0x904c, 0x377d,
0x377e, 0x904d, 0x3821, 0x904e, 0x3822, 0x904f, 0x9050, 0x9051,
@@ -3121,28 +3121,28 @@
0x9064, 0x9065, 0x9066, 0x3827, 0x3828, 0x9067, 0x3829, 0x9068,
0x382a, 0x382b, 0x9069, 0x906a, 0x382c, 0x382d, 0x906b, 0x906c,
0x906d, 0x906e, 0x906f, 0x9070, 0x9071, 0x9072, 0x9073, 0x9074,
- 0x9075, 0x9076, 0x9077, 0x9078, 0x9079, 0x907a, 0x9001, 0x9002,
- 0x9003, 0x9004, 0x9005, 0x9006, 0x9007, 0x9008, 0x9009, 0x900a,
- 0x900b, 0x900c, 0x900d, 0x382e, 0x382f, 0x900e, 0x900f, 0x3830,
- 0x9010, 0x9011, 0x9012, 0x3831, 0x9013, 0x9014, 0x9015, 0x9016,
- 0x9017, 0x9018, 0x9019, 0x3832, 0x3833, 0x901a, 0x3834, 0x901b,
- 0x3835, 0x901c, 0x901d, 0x901e, 0x901f, 0x9020, 0x9021, 0x3836,
- 0x3837, 0x9022, 0x9023, 0x3838, 0x9024, 0x3839, 0x383a, 0x383b,
- 0x383c, 0x383d, 0x9025, 0x9026, 0x9027, 0x9028, 0x9029, 0x383e,
- 0x383f, 0x902a, 0x3840, 0x902b, 0x3841, 0x3842, 0x902c, 0x902d,
- 0x3843, 0x902e, 0x3844, 0x3845, 0x3846, 0x902f, 0x9030, 0x3847,
- 0x9031, 0x9032, 0x9033, 0x3848, 0x9034, 0x9035, 0x9036, 0x9037,
- 0x9038, 0x9039, 0x903a, 0x3849, 0x384a, 0x903b, 0x384b, 0x384c,
- 0x384d, 0x384e, 0x903c, 0x903d, 0x903e, 0x903f, 0x9040, 0x384f,
- 0x3850, 0x9041, 0x9042, 0x9043, 0x9044, 0x9045, 0x9046, 0x3851,
- 0x9047, 0x9048, 0x9049, 0x904a, 0x904b, 0x904c, 0x904d, 0x904e,
- 0x904f, 0x9050, 0x9051, 0x9052, 0x3852, 0x9053, 0x9054, 0x9055,
- 0x9056, 0x9057, 0x9058, 0x9059, 0x905a, 0x905b, 0x905c, 0x905d,
- 0x905e, 0x905f, 0x9060, 0x9061, 0x9062, 0x9063, 0x9064, 0x9065,
- 0x9066, 0x9067, 0x9068, 0x9069, 0x906a, 0x906b, 0x906c, 0x906d,
- 0x906e, 0x906f, 0x9070, 0x9071, 0x9072, 0x9073, 0x9074, 0x3853,
- 0x3854, 0x9075, 0x9076, 0x3855, 0x9077, 0x9078, 0x9079, 0x3856,
- 0x907a, 0x3857, 0x907b, 0x907c, 0x907d, 0x907e, 0x9141, 0x3858,
+ 0x9075, 0x9076, 0x9077, 0x9078, 0x9079, 0x907a, 0x9081, 0x9082,
+ 0x9083, 0x9084, 0x9085, 0x9086, 0x9087, 0x9088, 0x9089, 0x908a,
+ 0x908b, 0x908c, 0x908d, 0x382e, 0x382f, 0x908e, 0x908f, 0x3830,
+ 0x9090, 0x9091, 0x9092, 0x3831, 0x9093, 0x9094, 0x9095, 0x9096,
+ 0x9097, 0x9098, 0x9099, 0x3832, 0x3833, 0x909a, 0x3834, 0x909b,
+ 0x3835, 0x909c, 0x909d, 0x909e, 0x909f, 0x90a0, 0x90a1, 0x3836,
+ 0x3837, 0x90a2, 0x90a3, 0x3838, 0x90a4, 0x3839, 0x383a, 0x383b,
+ 0x383c, 0x383d, 0x90a5, 0x90a6, 0x90a7, 0x90a8, 0x90a9, 0x383e,
+ 0x383f, 0x90aa, 0x3840, 0x90ab, 0x3841, 0x3842, 0x90ac, 0x90ad,
+ 0x3843, 0x90ae, 0x3844, 0x3845, 0x3846, 0x90af, 0x90b0, 0x3847,
+ 0x90b1, 0x90b2, 0x90b3, 0x3848, 0x90b4, 0x90b5, 0x90b6, 0x90b7,
+ 0x90b8, 0x90b9, 0x90ba, 0x3849, 0x384a, 0x90bb, 0x384b, 0x384c,
+ 0x384d, 0x384e, 0x90bc, 0x90bd, 0x90be, 0x90bf, 0x90c0, 0x384f,
+ 0x3850, 0x90c1, 0x90c2, 0x90c3, 0x90c4, 0x90c5, 0x90c6, 0x3851,
+ 0x90c7, 0x90c8, 0x90c9, 0x90ca, 0x90cb, 0x90cc, 0x90cd, 0x90ce,
+ 0x90cf, 0x90d0, 0x90d1, 0x90d2, 0x3852, 0x90d3, 0x90d4, 0x90d5,
+ 0x90d6, 0x90d7, 0x90d8, 0x90d9, 0x90da, 0x90db, 0x90dc, 0x90dd,
+ 0x90de, 0x90df, 0x90e0, 0x90e1, 0x90e2, 0x90e3, 0x90e4, 0x90e5,
+ 0x90e6, 0x90e7, 0x90e8, 0x90e9, 0x90ea, 0x90eb, 0x90ec, 0x90ed,
+ 0x90ee, 0x90ef, 0x90f0, 0x90f1, 0x90f2, 0x90f3, 0x90f4, 0x3853,
+ 0x3854, 0x90f5, 0x90f6, 0x3855, 0x90f7, 0x90f8, 0x90f9, 0x3856,
+ 0x90fa, 0x3857, 0x90fb, 0x90fc, 0x90fd, 0x90fe, 0x9141, 0x3858,
0x3859, 0x9142, 0x385a, 0x9143, 0x385b, 0x385c, 0x9144, 0x9145,
0x9146, 0x9147, 0x385d, 0x385e, 0x385f, 0x9148, 0x9149, 0x3860,
0x914a, 0x914b, 0x914c, 0x3861, 0x914d, 0x914e, 0x914f, 0x9150,
@@ -3152,25 +3152,25 @@
0x9166, 0x9167, 0x9168, 0x9169, 0x916a, 0x916b, 0x916c, 0x916d,
0x916e, 0x916f, 0x386b, 0x386c, 0x386d, 0x9170, 0x386e, 0x9171,
0x9172, 0x9173, 0x9174, 0x386f, 0x9175, 0x9176, 0x9177, 0x9178,
- 0x9179, 0x917a, 0x9101, 0x9102, 0x9103, 0x9104, 0x9105, 0x9106,
- 0x9107, 0x9108, 0x9109, 0x910a, 0x910b, 0x910c, 0x910d, 0x910e,
- 0x910f, 0x9110, 0x9111, 0x9112, 0x9113, 0x9114, 0x9115, 0x3870,
- 0x3871, 0x9116, 0x3872, 0x3873, 0x9117, 0x9118, 0x9119, 0x3874,
- 0x911a, 0x3875, 0x911b, 0x911c, 0x911d, 0x911e, 0x911f, 0x3876,
- 0x3877, 0x9120, 0x3878, 0x9121, 0x3879, 0x9122, 0x9123, 0x9124,
- 0x9125, 0x9126, 0x9127, 0x387a, 0x9128, 0x9129, 0x912a, 0x387b,
- 0x912b, 0x912c, 0x912d, 0x912e, 0x912f, 0x9130, 0x9131, 0x9132,
- 0x9133, 0x9134, 0x9135, 0x9136, 0x9137, 0x9138, 0x9139, 0x387c,
- 0x387d, 0x913a, 0x913b, 0x913c, 0x913d, 0x913e, 0x913f, 0x9140,
- 0x9141, 0x9142, 0x9143, 0x9144, 0x9145, 0x9146, 0x9147, 0x9148,
- 0x9149, 0x914a, 0x914b, 0x914c, 0x914d, 0x914e, 0x914f, 0x9150,
- 0x9151, 0x9152, 0x9153, 0x9154, 0x9155, 0x9156, 0x9157, 0x9158,
- 0x9159, 0x915a, 0x915b, 0x387e, 0x915c, 0x915d, 0x915e, 0x3921,
- 0x915f, 0x9160, 0x9161, 0x3922, 0x9162, 0x9163, 0x9164, 0x9165,
- 0x9166, 0x9167, 0x9168, 0x9169, 0x3923, 0x916a, 0x3924, 0x916b,
- 0x3925, 0x916c, 0x916d, 0x916e, 0x916f, 0x9170, 0x9171, 0x3926,
- 0x9172, 0x9173, 0x9174, 0x3927, 0x9175, 0x9176, 0x9177, 0x3928,
- 0x9178, 0x9179, 0x917a, 0x917b, 0x917c, 0x917d, 0x917e, 0x9241,
+ 0x9179, 0x917a, 0x9181, 0x9182, 0x9183, 0x9184, 0x9185, 0x9186,
+ 0x9187, 0x9188, 0x9189, 0x918a, 0x918b, 0x918c, 0x918d, 0x918e,
+ 0x918f, 0x9190, 0x9191, 0x9192, 0x9193, 0x9194, 0x9195, 0x3870,
+ 0x3871, 0x9196, 0x3872, 0x3873, 0x9197, 0x9198, 0x9199, 0x3874,
+ 0x919a, 0x3875, 0x919b, 0x919c, 0x919d, 0x919e, 0x919f, 0x3876,
+ 0x3877, 0x91a0, 0x3878, 0x91a1, 0x3879, 0x91a2, 0x91a3, 0x91a4,
+ 0x91a5, 0x91a6, 0x91a7, 0x387a, 0x91a8, 0x91a9, 0x91aa, 0x387b,
+ 0x91ab, 0x91ac, 0x91ad, 0x91ae, 0x91af, 0x91b0, 0x91b1, 0x91b2,
+ 0x91b3, 0x91b4, 0x91b5, 0x91b6, 0x91b7, 0x91b8, 0x91b9, 0x387c,
+ 0x387d, 0x91ba, 0x91bb, 0x91bc, 0x91bd, 0x91be, 0x91bf, 0x91c0,
+ 0x91c1, 0x91c2, 0x91c3, 0x91c4, 0x91c5, 0x91c6, 0x91c7, 0x91c8,
+ 0x91c9, 0x91ca, 0x91cb, 0x91cc, 0x91cd, 0x91ce, 0x91cf, 0x91d0,
+ 0x91d1, 0x91d2, 0x91d3, 0x91d4, 0x91d5, 0x91d6, 0x91d7, 0x91d8,
+ 0x91d9, 0x91da, 0x91db, 0x387e, 0x91dc, 0x91dd, 0x91de, 0x3921,
+ 0x91df, 0x91e0, 0x91e1, 0x3922, 0x91e2, 0x91e3, 0x91e4, 0x91e5,
+ 0x91e6, 0x91e7, 0x91e8, 0x91e9, 0x3923, 0x91ea, 0x3924, 0x91eb,
+ 0x3925, 0x91ec, 0x91ed, 0x91ee, 0x91ef, 0x91f0, 0x91f1, 0x3926,
+ 0x91f2, 0x91f3, 0x91f4, 0x3927, 0x91f5, 0x91f6, 0x91f7, 0x3928,
+ 0x91f8, 0x91f9, 0x91fa, 0x91fb, 0x91fc, 0x91fd, 0x91fe, 0x9241,
0x3929, 0x9242, 0x392a, 0x9243, 0x9244, 0x9245, 0x9246, 0x9247,
0x9248, 0x9249, 0x924a, 0x392b, 0x392c, 0x392d, 0x924b, 0x392e,
0x924c, 0x924d, 0x392f, 0x3930, 0x3931, 0x3932, 0x924e, 0x924f,
@@ -3180,25 +3180,25 @@
0x9265, 0x9266, 0x9267, 0x9268, 0x9269, 0x926a, 0x926b, 0x926c,
0x393c, 0x926d, 0x393d, 0x926e, 0x926f, 0x9270, 0x9271, 0x9272,
0x9273, 0x9274, 0x9275, 0x393e, 0x9276, 0x9277, 0x9278, 0x9279,
- 0x927a, 0x9201, 0x9202, 0x9203, 0x9204, 0x9205, 0x9206, 0x9207,
- 0x9208, 0x9209, 0x920a, 0x920b, 0x920c, 0x920d, 0x920e, 0x920f,
- 0x9210, 0x9211, 0x9212, 0x9213, 0x9214, 0x9215, 0x9216, 0x393f,
- 0x9217, 0x9218, 0x9219, 0x3940, 0x921a, 0x921b, 0x921c, 0x3941,
- 0x921d, 0x921e, 0x921f, 0x9220, 0x9221, 0x9222, 0x9223, 0x9224,
- 0x9225, 0x9226, 0x9227, 0x9228, 0x9229, 0x922a, 0x922b, 0x922c,
- 0x922d, 0x922e, 0x922f, 0x3942, 0x9230, 0x9231, 0x9232, 0x3943,
- 0x9233, 0x9234, 0x9235, 0x3944, 0x9236, 0x9237, 0x9238, 0x9239,
- 0x923a, 0x923b, 0x923c, 0x3945, 0x923d, 0x923e, 0x3946, 0x923f,
- 0x9240, 0x9241, 0x9242, 0x9243, 0x9244, 0x9245, 0x9246, 0x3947,
- 0x9247, 0x9248, 0x9249, 0x3948, 0x924a, 0x924b, 0x924c, 0x3949,
- 0x924d, 0x924e, 0x924f, 0x9250, 0x9251, 0x9252, 0x9253, 0x394a,
- 0x9254, 0x9255, 0x394b, 0x9256, 0x9257, 0x9258, 0x9259, 0x925a,
- 0x925b, 0x925c, 0x925d, 0x925e, 0x925f, 0x9260, 0x9261, 0x9262,
- 0x9263, 0x9264, 0x9265, 0x9266, 0x9267, 0x9268, 0x9269, 0x926a,
- 0x926b, 0x926c, 0x926d, 0x926e, 0x926f, 0x9270, 0x9271, 0x9272,
- 0x9273, 0x9274, 0x9275, 0x9276, 0x9277, 0x9278, 0x9279, 0x394c,
- 0x394d, 0x927a, 0x927b, 0x394e, 0x927c, 0x927d, 0x394f, 0x3950,
- 0x927e, 0x3951, 0x9341, 0x9342, 0x9343, 0x9344, 0x9345, 0x3952,
+ 0x927a, 0x9281, 0x9282, 0x9283, 0x9284, 0x9285, 0x9286, 0x9287,
+ 0x9288, 0x9289, 0x928a, 0x928b, 0x928c, 0x928d, 0x928e, 0x928f,
+ 0x9290, 0x9291, 0x9292, 0x9293, 0x9294, 0x9295, 0x9296, 0x393f,
+ 0x9297, 0x9298, 0x9299, 0x3940, 0x929a, 0x929b, 0x929c, 0x3941,
+ 0x929d, 0x929e, 0x929f, 0x92a0, 0x92a1, 0x92a2, 0x92a3, 0x92a4,
+ 0x92a5, 0x92a6, 0x92a7, 0x92a8, 0x92a9, 0x92aa, 0x92ab, 0x92ac,
+ 0x92ad, 0x92ae, 0x92af, 0x3942, 0x92b0, 0x92b1, 0x92b2, 0x3943,
+ 0x92b3, 0x92b4, 0x92b5, 0x3944, 0x92b6, 0x92b7, 0x92b8, 0x92b9,
+ 0x92ba, 0x92bb, 0x92bc, 0x3945, 0x92bd, 0x92be, 0x3946, 0x92bf,
+ 0x92c0, 0x92c1, 0x92c2, 0x92c3, 0x92c4, 0x92c5, 0x92c6, 0x3947,
+ 0x92c7, 0x92c8, 0x92c9, 0x3948, 0x92ca, 0x92cb, 0x92cc, 0x3949,
+ 0x92cd, 0x92ce, 0x92cf, 0x92d0, 0x92d1, 0x92d2, 0x92d3, 0x394a,
+ 0x92d4, 0x92d5, 0x394b, 0x92d6, 0x92d7, 0x92d8, 0x92d9, 0x92da,
+ 0x92db, 0x92dc, 0x92dd, 0x92de, 0x92df, 0x92e0, 0x92e1, 0x92e2,
+ 0x92e3, 0x92e4, 0x92e5, 0x92e6, 0x92e7, 0x92e8, 0x92e9, 0x92ea,
+ 0x92eb, 0x92ec, 0x92ed, 0x92ee, 0x92ef, 0x92f0, 0x92f1, 0x92f2,
+ 0x92f3, 0x92f4, 0x92f5, 0x92f6, 0x92f7, 0x92f8, 0x92f9, 0x394c,
+ 0x394d, 0x92fa, 0x92fb, 0x394e, 0x92fc, 0x92fd, 0x394f, 0x3950,
+ 0x92fe, 0x3951, 0x9341, 0x9342, 0x9343, 0x9344, 0x9345, 0x3952,
0x3953, 0x9346, 0x3954, 0x3955, 0x3956, 0x9347, 0x3957, 0x9348,
0x3958, 0x9349, 0x934a, 0x3959, 0x395a, 0x395b, 0x395c, 0x395d,
0x934b, 0x934c, 0x395e, 0x395f, 0x3960, 0x3961, 0x3962, 0x934d,
@@ -3209,27 +3209,27 @@
0x396d, 0x936a, 0x396e, 0x396f, 0x3970, 0x936b, 0x936c, 0x936d,
0x3971, 0x936e, 0x936f, 0x3972, 0x3973, 0x9370, 0x9371, 0x3974,
0x9372, 0x9373, 0x9374, 0x9375, 0x9376, 0x9377, 0x9378, 0x9379,
- 0x937a, 0x9301, 0x9302, 0x9303, 0x3975, 0x9304, 0x9305, 0x9306,
- 0x9307, 0x9308, 0x9309, 0x930a, 0x930b, 0x930c, 0x930d, 0x930e,
- 0x930f, 0x9310, 0x9311, 0x9312, 0x9313, 0x9314, 0x9315, 0x9316,
- 0x9317, 0x9318, 0x9319, 0x931a, 0x931b, 0x931c, 0x931d, 0x931e,
- 0x931f, 0x9320, 0x9321, 0x9322, 0x9323, 0x9324, 0x9325, 0x9326,
- 0x9327, 0x9328, 0x9329, 0x3976, 0x3977, 0x932a, 0x932b, 0x3978,
- 0x932c, 0x932d, 0x3979, 0x397a...
[truncated message content] |
|
From: Hye-Shik C. <pe...@us...> - 2003-05-27 04:18:24
|
perky 03/05/26 21:18:24
Added: tests testall.py
Removed: tests regrtest.py
Log:
Add testall script.
Revision Changes Path
1.1 cjkcodecs/tests/testall.py
Index: testall.py
===================================================================
#!/usr/bin/env python
#
# testall.py: Run all unittests.
#
# Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# $Id: testall.py,v 1.1 2003/05/27 04:18:23 perky Exp $
#
import sys
import os, unittest
def findtests(testdir='.'):
tests = []
for name in os.listdir(testdir):
if (name.startswith('test_') and name.endswith('.py')
and not name.endswith('support.py')):
tests.append(name[:-3])
return tests
def runtest(test):
mod = __import__(test, globals(), locals(), [])
mod.test_main()
def main():
for test in findtests():
runtest(test)
if __name__ == '__main__':
main()
# ex: ts=8 sts=4 et
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-27 02:44:41
|
perky 03/05/26 19:44:40
Added: tests regrtest.py
Log:
Import regrtest from python project.
Revision Changes Path
1.1 cjkcodecs/tests/regrtest.py
Index: regrtest.py
===================================================================
#! /usr/bin/env python
"""Regression test.
This will find all modules whose name is "test_*" in the test
directory, and run them. Various command line options provide
additional facilities.
Command line options:
-v: verbose -- run tests in verbose mode with output to stdout
-q: quiet -- don't print anything except if a test fails
-g: generate -- write the output file for a test instead of comparing it
-x: exclude -- arguments are tests to *exclude*
-s: single -- run only a single test (see below)
-r: random -- randomize test execution order
-f: fromfile -- read names of tests to run from a file (see below)
-l: findleaks -- if GC is available detect tests that leak memory
-u: use -- specify which special resource intensive tests to run
-h: help -- print this text and exit
-t: threshold -- call gc.set_threshold(N)
If non-option arguments are present, they are names for tests to run,
unless -x is given, in which case they are names for tests not to run.
If no test names are given, all tests are run.
-v is incompatible with -g and does not compare test output files.
-s means to run only a single test and exit. This is useful when
doing memory analysis on the Python interpreter (which tend to consume
too many resources to run the full regression test non-stop). The
file /tmp/pynexttest is read to find the next test to run. If this
file is missing, the first test_*.py file in testdir or on the command
line is used. (actually tempfile.gettempdir() is used instead of
/tmp).
-f reads the names of tests from the file given as f's argument, one
or more test names per line. Whitespace is ignored. Blank lines and
lines beginning with '#' are ignored. This is especially useful for
whittling down failures involving interactions among tests.
-u is used to specify which special resource intensive tests to run,
such as those requiring large file support or network connectivity.
The argument is a comma-separated list of words indicating the
resources to test. Currently only the following are defined:
all - Enable all special resources.
audio - Tests that use the audio device. (There are known
cases of broken audio drivers that can crash Python or
even the Linux kernel.)
curses - Tests that use curses and will modify the terminal's
state and output modes.
largefile - It is okay to run some test that may create huge
files. These tests can take a long time and may
consume >2GB of disk space temporarily.
network - It is okay to run tests that use external network
resource, e.g. testing SSL support for sockets.
bsddb - It is okay to run the bsddb testsuite, which takes
a long time to complete.
To enable all resources except one, use '-uall,-<resource>'. For
example, to run all the tests except for the bsddb tests, give the
option '-uall,-bsddb'.
"""
import sys
import os
import getopt
import traceback
import random
import cStringIO
import warnings
from sets import Set
# I see no other way to suppress these warnings;
# putting them in test_grammar.py has no effect:
warnings.filterwarnings("ignore", "hex/oct constants", FutureWarning,
".*test.test_grammar$")
if sys.maxint > 0x7fffffff:
# Also suppress them in <string>, because for 64-bit platforms,
# that's where test_grammar.py hides them.
warnings.filterwarnings("ignore", "hex/oct constants", FutureWarning,
"<string>")
# MacOSX (a.k.a. Darwin) has a default stack size that is too small
# for deeply recursive regular expressions. We see this as crashes in
# the Python test suite when running test_re.py and test_sre.py. The
# fix is to set the stack limit to 2048.
# This approach may also be useful for other Unixy platforms that
# suffer from small default stack limits.
if sys.platform == 'darwin':
try:
import resource
except ImportError:
pass
else:
soft, hard = resource.getrlimit(resource.RLIMIT_STACK)
newsoft = min(hard, max(soft, 1024*2048))
resource.setrlimit(resource.RLIMIT_STACK, (newsoft, hard))
from test import test_support
RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network', 'bsddb')
def usage(code, msg=''):
print __doc__
if msg: print msg
sys.exit(code)
def main(tests=None, testdir=None, verbose=0, quiet=0, generate=0,
exclude=0, single=0, randomize=0, fromfile=None, findleaks=0,
use_resources=None):
"""Execute a test suite.
This also parses command-line options and modifies its behavior
accordingly.
tests -- a list of strings containing test names (optional)
testdir -- the directory in which to look for tests (optional)
Users other than the Python test suite will certainly want to
specify testdir; if it's omitted, the directory containing the
Python test suite is searched for.
If the tests argument is omitted, the tests listed on the
command-line will be used. If that's empty, too, then all *.py
files beginning with test_ will be used.
The other default arguments (verbose, quiet, generate, exclude,
single, randomize, findleaks, and use_resources) allow programmers
calling main() directly to set the values that would normally be
set by flags on the command line.
"""
test_support.record_original_stdout(sys.stdout)
try:
opts, args = getopt.getopt(sys.argv[1:], 'hvgqxsrf:lu:t:',
['help', 'verbose', 'quiet', 'generate',
'exclude', 'single', 'random', 'fromfile',
'findleaks', 'use=', 'threshold='])
except getopt.error, msg:
usage(2, msg)
# Defaults
if use_resources is None:
use_resources = []
for o, a in opts:
if o in ('-h', '--help'):
usage(0)
elif o in ('-v', '--verbose'):
verbose += 1
elif o in ('-q', '--quiet'):
quiet = 1;
verbose = 0
elif o in ('-g', '--generate'):
generate = 1
elif o in ('-x', '--exclude'):
exclude = 1
elif o in ('-s', '--single'):
single = 1
elif o in ('-r', '--randomize'):
randomize = 1
elif o in ('-f', '--fromfile'):
fromfile = a
elif o in ('-l', '--findleaks'):
findleaks = 1
elif o in ('-t', '--threshold'):
import gc
gc.set_threshold(int(a))
elif o in ('-u', '--use'):
u = [x.lower() for x in a.split(',')]
for r in u:
if r == 'all':
use_resources[:] = RESOURCE_NAMES
continue
remove = False
if r[0] == '-':
remove = True
r = r[1:]
if r not in RESOURCE_NAMES:
usage(1, 'Invalid -u/--use option: ' + a)
if remove:
if r in use_resources:
use_resources.remove(r)
elif r not in use_resources:
use_resources.append(r)
if generate and verbose:
usage(2, "-g and -v don't go together!")
if single and fromfile:
usage(2, "-s and -f don't go together!")
good = []
bad = []
skipped = []
resource_denieds = []
if findleaks:
try:
import gc
except ImportError:
print 'No GC available, disabling findleaks.'
findleaks = 0
else:
# Uncomment the line below to report garbage that is not
# freeable by reference counting alone. By default only
# garbage that is not collectable by the GC is reported.
#gc.set_debug(gc.DEBUG_SAVEALL)
found_garbage = []
if single:
from tempfile import gettempdir
filename = os.path.join(gettempdir(), 'pynexttest')
try:
fp = open(filename, 'r')
next = fp.read().strip()
tests = [next]
fp.close()
except IOError:
pass
if fromfile:
tests = []
fp = open(fromfile)
for line in fp:
guts = line.split() # assuming no test has whitespace in its name
if guts and not guts[0].startswith('#'):
tests.extend(guts)
fp.close()
# Strip .py extensions.
if args:
args = map(removepy, args)
if tests:
tests = map(removepy, tests)
stdtests = STDTESTS[:]
nottests = NOTTESTS[:]
if exclude:
for arg in args:
if arg in stdtests:
stdtests.remove(arg)
nottests[:0] = args
args = []
tests = tests or args or findtests(testdir, stdtests, nottests)
if single:
tests = tests[:1]
if randomize:
random.shuffle(tests)
test_support.verbose = verbose # Tell tests to be moderately quiet
test_support.use_resources = use_resources
save_modules = sys.modules.keys()
for test in tests:
if not quiet:
print test
sys.stdout.flush()
ok = runtest(test, generate, verbose, quiet, testdir)
if ok > 0:
good.append(test)
elif ok == 0:
bad.append(test)
else:
skipped.append(test)
if ok == -2:
resource_denieds.append(test)
if findleaks:
gc.collect()
if gc.garbage:
print "Warning: test created", len(gc.garbage),
print "uncollectable object(s)."
# move the uncollectable objects somewhere so we don't see
# them again
found_garbage.extend(gc.garbage)
del gc.garbage[:]
# Unload the newly imported modules (best effort finalization)
for module in sys.modules.keys():
if module not in save_modules and module.startswith("test."):
test_support.unload(module)
# The lists won't be sorted if running with -r
good.sort()
bad.sort()
skipped.sort()
if good and not quiet:
if not bad and not skipped and len(good) > 1:
print "All",
print count(len(good), "test"), "OK."
if verbose:
print "CAUTION: stdout isn't compared in verbose mode:"
print "a test that passes in verbose mode may fail without it."
if bad:
print count(len(bad), "test"), "failed:"
printlist(bad)
if skipped and not quiet:
print count(len(skipped), "test"), "skipped:"
printlist(skipped)
e = _ExpectedSkips()
plat = sys.platform
if e.isvalid():
surprise = Set(skipped) - e.getexpected() - Set(resource_denieds)
if surprise:
print count(len(surprise), "skip"), \
"unexpected on", plat + ":"
printlist(surprise)
else:
print "Those skips are all expected on", plat + "."
else:
print "Ask someone to teach regrtest.py about which tests are"
print "expected to get skipped on", plat + "."
if single:
alltests = findtests(testdir, stdtests, nottests)
for i in range(len(alltests)):
if tests[0] == alltests[i]:
if i == len(alltests) - 1:
os.unlink(filename)
else:
fp = open(filename, 'w')
fp.write(alltests[i+1] + '\n')
fp.close()
break
else:
os.unlink(filename)
sys.exit(len(bad) > 0)
STDTESTS = [
'test_grammar',
'test_opcodes',
'test_operations',
'test_builtin',
'test_exceptions',
'test_types',
]
NOTTESTS = [
'test_support',
'test_future1',
'test_future2',
'test_future3',
]
def findtests(testdir=None, stdtests=STDTESTS, nottests=NOTTESTS):
"""Return a list of all applicable test modules."""
if not testdir: testdir = findtestdir()
names = os.listdir(testdir)
tests = []
for name in names:
if name[:5] == "test_" and name[-3:] == os.extsep+"py":
modname = name[:-3]
if modname not in stdtests and modname not in nottests:
tests.append(modname)
tests.sort()
return stdtests + tests
def runtest(test, generate, verbose, quiet, testdir = None):
"""Run a single test.
test -- the name of the test
generate -- if true, generate output, instead of running the test
and comparing it to a previously created output file
verbose -- if true, print more messages
quiet -- if true, don't print 'skipped' messages (probably redundant)
testdir -- test directory
"""
test_support.unload(test)
if not testdir: testdir = findtestdir()
outputdir = os.path.join(testdir, "output")
outputfile = os.path.join(outputdir, test)
if verbose:
cfp = None
else:
cfp = cStringIO.StringIO()
try:
save_stdout = sys.stdout
try:
if cfp:
sys.stdout = cfp
print test # Output file starts with test name
if test.startswith('test.'):
abstest = test
else:
# Always import it from the test package
abstest = 'test.' + test
the_package = __import__(abstest, globals(), locals(), [])
the_module = getattr(the_package, test)
# Most tests run to completion simply as a side-effect of
# being imported. For the benefit of tests that can't run
# that way (like test_threaded_import), explicitly invoke
# their test_main() function (if it exists).
indirect_test = getattr(the_module, "test_main", None)
if indirect_test is not None:
indirect_test()
finally:
sys.stdout = save_stdout
except test_support.ResourceDenied, msg:
if not quiet:
print test, "skipped --", msg
sys.stdout.flush()
return -2
except (ImportError, test_support.TestSkipped), msg:
if not quiet:
print test, "skipped --", msg
sys.stdout.flush()
return -1
except KeyboardInterrupt:
raise
except test_support.TestFailed, msg:
print "test", test, "failed --", msg
sys.stdout.flush()
return 0
except:
type, value = sys.exc_info()[:2]
print "test", test, "crashed --", str(type) + ":", value
sys.stdout.flush()
if verbose:
traceback.print_exc(file=sys.stdout)
sys.stdout.flush()
return 0
else:
if not cfp:
return 1
output = cfp.getvalue()
if generate:
if output == test + "\n":
if os.path.exists(outputfile):
# Write it since it already exists (and the contents
# may have changed), but let the user know it isn't
# needed:
print "output file", outputfile, \
"is no longer needed; consider removing it"
else:
# We don't need it, so don't create it.
return 1
fp = open(outputfile, "w")
fp.write(output)
fp.close()
return 1
if os.path.exists(outputfile):
fp = open(outputfile, "r")
expected = fp.read()
fp.close()
else:
expected = test + "\n"
if output == expected:
return 1
print "test", test, "produced unexpected output:"
sys.stdout.flush()
reportdiff(expected, output)
sys.stdout.flush()
return 0
def reportdiff(expected, output):
import difflib
print "*" * 70
a = expected.splitlines(1)
b = output.splitlines(1)
sm = difflib.SequenceMatcher(a=a, b=b)
tuples = sm.get_opcodes()
def pair(x0, x1):
# x0:x1 are 0-based slice indices; convert to 1-based line indices.
x0 += 1
if x0 >= x1:
return "line " + str(x0)
else:
return "lines %d-%d" % (x0, x1)
for op, a0, a1, b0, b1 in tuples:
if op == 'equal':
pass
elif op == 'delete':
print "***", pair(a0, a1), "of expected output missing:"
for line in a[a0:a1]:
print "-", line,
elif op == 'replace':
print "*** mismatch between", pair(a0, a1), "of expected", \
"output and", pair(b0, b1), "of actual output:"
for line in difflib.ndiff(a[a0:a1], b[b0:b1]):
print line,
elif op == 'insert':
print "***", pair(b0, b1), "of actual output doesn't appear", \
"in expected output after line", str(a1)+":"
for line in b[b0:b1]:
print "+", line,
else:
print "get_opcodes() returned bad tuple?!?!", (op, a0, a1, b0, b1)
print "*" * 70
def findtestdir():
if __name__ == '__main__':
file = sys.argv[0]
else:
file = __file__
testdir = os.path.dirname(file) or os.curdir
return testdir
def removepy(name):
if name.endswith(os.extsep + "py"):
name = name[:-3]
return name
def count(n, word):
if n == 1:
return "%d %s" % (n, word)
else:
return "%d %ss" % (n, word)
def printlist(x, width=70, indent=4):
"""Print the elements of iterable x to stdout.
Optional arg width (default 70) is the maximum line length.
Optional arg indent (default 4) is the number of blanks with which to
begin each line.
"""
from textwrap import fill
blanks = ' ' * indent
print fill(' '.join(map(str, x)), width,
initial_indent=blanks, subsequent_indent=blanks)
# Map sys.platform to a string containing the basenames of tests
# expected to be skipped on that platform.
#
# Special cases:
# test_pep277
# The _ExpectedSkips constructor adds this to the set of expected
# skips if not os.path.supports_unicode_filenames.
# test_normalization
# Whether a skip is expected here depends on whether a large test
# input file has been downloaded. test_normalization.skip_expected
# controls that.
# test_socket_ssl
# Controlled by test_socket_ssl.skip_expected. Requires the network
# resource, and a socket module with ssl support.
# test_timeout
# Controlled by test_timeout.skip_expected. Requires the network
# resource and a socket module.
_expectations = {
'win32':
"""
test_al
test_bsddb185
test_bsddb3
test_cd
test_cl
test_commands
test_crypt
test_curses
test_dbm
test_dl
test_email_codecs
test_fcntl
test_fork1
test_gdbm
test_gl
test_grp
test_imgfile
test_ioctl
test_largefile
test_linuxaudiodev
test_mhlib
test_mpz
test_nis
test_openpty
test_ossaudiodev
test_poll
test_posix
test_pty
test_pwd
test_resource
test_signal
test_sunaudiodev
test_timing
""",
'linux2':
"""
test_al
test_bsddb185
test_cd
test_cl
test_curses
test_dl
test_email_codecs
test_gl
test_imgfile
test_largefile
test_linuxaudiodev
test_nis
test_ntpath
test_ossaudiodev
test_sunaudiodev
""",
'mac':
"""
test_al
test_atexit
test_bsddb
test_bsddb185
test_bsddb3
test_bz2
test_cd
test_cl
test_commands
test_crypt
test_curses
test_dbm
test_dl
test_email_codecs
test_fcntl
test_fork1
test_gl
test_grp
test_ioctl
test_imgfile
test_largefile
test_linuxaudiodev
test_locale
test_mmap
test_mpz
test_nis
test_ntpath
test_openpty
test_ossaudiodev
test_poll
test_popen
test_popen2
test_posix
test_pty
test_pwd
test_resource
test_signal
test_sunaudiodev
test_sundry
test_tarfile
test_timing
""",
'unixware7':
"""
test_al
test_bsddb
test_bsddb185
test_cd
test_cl
test_dl
test_gl
test_imgfile
test_largefile
test_linuxaudiodev
test_minidom
test_nis
test_ntpath
test_openpty
test_pyexpat
test_sax
test_sunaudiodev
test_sundry
""",
'openunix8':
"""
test_al
test_bsddb
test_bsddb185
test_cd
test_cl
test_dl
test_gl
test_imgfile
test_largefile
test_linuxaudiodev
test_minidom
test_nis
test_ntpath
test_openpty
test_pyexpat
test_sax
test_sunaudiodev
test_sundry
""",
'sco_sv3':
"""
test_al
test_asynchat
test_bsddb
test_bsddb185
test_cd
test_cl
test_dl
test_fork1
test_gettext
test_gl
test_imgfile
test_largefile
test_linuxaudiodev
test_locale
test_minidom
test_nis
test_ntpath
test_openpty
test_pyexpat
test_queue
test_sax
test_sunaudiodev
test_sundry
test_thread
test_threaded_import
test_threadedtempfile
test_threading
""",
'riscos':
"""
test_al
test_asynchat
test_atexit
test_bsddb
test_bsddb185
test_bsddb3
test_cd
test_cl
test_commands
test_crypt
test_dbm
test_dl
test_fcntl
test_fork1
test_gdbm
test_gl
test_grp
test_imgfile
test_largefile
test_linuxaudiodev
test_locale
test_mmap
test_nis
test_ntpath
test_openpty
test_poll
test_popen2
test_pty
test_pwd
test_strop
test_sunaudiodev
test_sundry
test_thread
test_threaded_import
test_threadedtempfile
test_threading
test_timing
""",
'darwin':
"""
test_al
test_bsddb
test_bsddb3
test_cd
test_cl
test_curses
test_dl
test_email_codecs
test_gdbm
test_gl
test_imgfile
test_largefile
test_linuxaudiodev
test_locale
test_minidom
test_mpz
test_nis
test_ntpath
test_ossaudiodev
test_poll
test_sunaudiodev
""",
'sunos5':
"""
test_al
test_bsddb
test_bsddb185
test_cd
test_cl
test_curses
test_dbm
test_email_codecs
test_gdbm
test_gl
test_gzip
test_imgfile
test_linuxaudiodev
test_mpz
test_openpty
test_zipfile
test_zlib
""",
'hp-ux11':
"""
test_al
test_bsddb
test_bsddb185
test_cd
test_cl
test_curses
test_dl
test_gdbm
test_gl
test_gzip
test_imgfile
test_largefile
test_linuxaudiodev
test_locale
test_minidom
test_nis
test_ntpath
test_openpty
test_pyexpat
test_sax
test_sunaudiodev
test_zipfile
test_zlib
""",
'atheos':
"""
test_al
test_bsddb185
test_cd
test_cl
test_curses
test_dl
test_email_codecs
test_gdbm
test_gl
test_imgfile
test_largefile
test_linuxaudiodev
test_locale
test_mhlib
test_mmap
test_mpz
test_nis
test_poll
test_popen2
test_resource
test_sunaudiodev
""",
'cygwin':
"""
test_al
test_bsddb185
test_bsddb3
test_cd
test_cl
test_curses
test_dbm
test_email_codecs
test_gl
test_imgfile
test_largefile
test_linuxaudiodev
test_locale
test_mpz
test_nis
test_ossaudiodev
test_socketserver
test_sunaudiodev
""",
'os2emx':
"""
test_al
test_audioop
test_bsddb185
test_bsddb3
test_cd
test_cl
test_commands
test_curses
test_dl
test_email_codecs
test_gl
test_imgfile
test_largefile
test_linuxaudiodev
test_mhlib
test_mmap
test_nis
test_openpty
test_ossaudiodev
test_pty
test_resource
test_signal
test_sunaudiodev
""",
}
class _ExpectedSkips:
def __init__(self):
import os.path
from test import test_normalization
from test import test_socket_ssl
from test import test_timeout
self.valid = False
if sys.platform in _expectations:
s = _expectations[sys.platform]
self.expected = Set(s.split())
if not os.path.supports_unicode_filenames:
self.expected.add('test_pep277')
if test_normalization.skip_expected:
self.expected.add('test_normalization')
if test_socket_ssl.skip_expected:
self.expected.add('test_socket_ssl')
if test_timeout.skip_expected:
self.expected.add('test_timeout')
if not sys.platform in ("mac", "darwin"):
MAC_ONLY = ["test_macostools", "test_macfs", "test_aepack",
"test_plistlib", "test_scriptpackages"]
for skip in MAC_ONLY:
self.expected.add(skip)
if sys.platform != "win32":
WIN_ONLY = ["test_unicode_file", "test_winreg",
"test_winsound"]
for skip in WIN_ONLY:
self.expected.add(skip)
self.valid = True
def isvalid(self):
"Return true iff _ExpectedSkips knows about the current platform."
return self.valid
def getexpected(self):
"""Return set of test names we expect to skip on current platform.
self.isvalid() must be true.
"""
assert self.isvalid()
return self.expected
if __name__ == '__main__':
# Remove regrtest.py's own directory from the module search path. This
# prevents relative imports from working, and relative imports will screw
# up the testing framework. E.g. if both test.test_support and
# test_support are imported, they will not contain the same globals, and
# much of the testing framework relies on the globals in the
# test.test_support module.
mydir = os.path.abspath(os.path.normpath(os.path.dirname(sys.argv[0])))
i = pathlen = len(sys.path)
while i >= 0:
i -= 1
if os.path.abspath(os.path.normpath(sys.path[i])) == mydir:
del sys.path[i]
if len(sys.path) == pathlen:
print 'Could not find %r in sys.path to remove it' % mydir
main()
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-26 15:31:53
|
perky 03/05/26 08:31:51
Modified: cjkcodecs aliases.py
Log:
Use _ for - in aliases.
Revision Changes Path
1.2 +2 -2 cjkcodecs/cjkcodecs/aliases.py
Index: aliases.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/aliases.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aliases.py 20 May 2003 08:32:16 -0000 1.1
+++ aliases.py 26 May 2003 15:31:51 -0000 1.2
@@ -26,7 +26,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: aliases.py,v 1.1 2003/05/20 08:32:16 perky Exp $
+# $Id: aliases.py,v 1.2 2003/05/26 15:31:51 perky Exp $
#
from encodings.aliases import aliases
@@ -58,7 +58,7 @@
'eucjp' : 'cjkcodecs.euc_jp',
'euc_jp' : 'cjkcodecs.euc_jp',
'ujis' : 'cjkcodecs.euc_jp',
- 'u-jis' : 'cjkcodecs.euc_jp',
+ 'u_jis' : 'cjkcodecs.euc_jp',
# euc_kr codec
'euckr' : 'cjkcodecs.euc_kr',
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-26 15:28:29
|
perky 03/05/26 08:28:27
Modified: cjkcodecs Makefile big5.py cp932.py cp949.py cp950.py
euc_jp.py euc_kr.py gb18030.py gb2312.py gbk.py
shift_jis.py
Log:
Correct comments.
Revision Changes Path
1.2 +2 -2 cjkcodecs/cjkcodecs/Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile 20 May 2003 08:12:36 -0000 1.1
+++ Makefile 26 May 2003 15:28:27 -0000 1.2
@@ -25,7 +25,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: Makefile,v 1.1 2003/05/20 08:12:36 perky Exp $
+# $Id: Makefile,v 1.2 2003/05/26 15:28:27 perky Exp $
#
GENERIC_ENCODINGS= gb2312 gbk gb18030 \
@@ -38,7 +38,7 @@
CSET=`echo $$cset|tr "[:lower:]" "[:upper:]"`; \
sed -e "s/%%ENCODING%%/$$CSET/g" \
-e "s/%%encoding%%/$$cset/g" \
- -e "s/%%__%%/ACHTUNG: This is generated file automatically.\
+ -e "s/%%__%%/ACHTUNG: This file is generated automatically.\
Please do not edit./g" xxcodec.py.in \
> $$cset.py; \
done
1.3 +2 -2 cjkcodecs/cjkcodecs/big5.py
Index: big5.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/big5.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- big5.py 20 May 2003 08:12:36 -0000 1.2
+++ big5.py 26 May 2003 15:28:27 -0000 1.3
@@ -1,4 +1,4 @@
-# ACHTUNG: This is generated file automatically. Please do not edit.
+# ACHTUNG: This file is generated automatically. Please do not edit.
#
# big5.py: Python Unicode Codec for BIG5
#
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: big5.py,v 1.2 2003/05/20 08:12:36 perky Exp $
+# $Id: big5.py,v 1.3 2003/05/26 15:28:27 perky Exp $
#
from cjkcodecs._big5 import codec
1.3 +2 -2 cjkcodecs/cjkcodecs/cp932.py
Index: cp932.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/cp932.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cp932.py 20 May 2003 08:12:36 -0000 1.2
+++ cp932.py 26 May 2003 15:28:27 -0000 1.3
@@ -1,4 +1,4 @@
-# ACHTUNG: This is generated file automatically. Please do not edit.
+# ACHTUNG: This file is generated automatically. Please do not edit.
#
# cp932.py: Python Unicode Codec for CP932
#
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: cp932.py,v 1.2 2003/05/20 08:12:36 perky Exp $
+# $Id: cp932.py,v 1.3 2003/05/26 15:28:27 perky Exp $
#
from cjkcodecs._cp932 import codec
1.3 +2 -2 cjkcodecs/cjkcodecs/cp949.py
Index: cp949.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/cp949.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cp949.py 20 May 2003 08:12:36 -0000 1.2
+++ cp949.py 26 May 2003 15:28:27 -0000 1.3
@@ -1,4 +1,4 @@
-# ACHTUNG: This is generated file automatically. Please do not edit.
+# ACHTUNG: This file is generated automatically. Please do not edit.
#
# cp949.py: Python Unicode Codec for CP949
#
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: cp949.py,v 1.2 2003/05/20 08:12:36 perky Exp $
+# $Id: cp949.py,v 1.3 2003/05/26 15:28:27 perky Exp $
#
from cjkcodecs._cp949 import codec
1.3 +2 -2 cjkcodecs/cjkcodecs/cp950.py
Index: cp950.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/cp950.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cp950.py 20 May 2003 08:12:36 -0000 1.2
+++ cp950.py 26 May 2003 15:28:27 -0000 1.3
@@ -1,4 +1,4 @@
-# ACHTUNG: This is generated file automatically. Please do not edit.
+# ACHTUNG: This file is generated automatically. Please do not edit.
#
# cp950.py: Python Unicode Codec for CP950
#
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: cp950.py,v 1.2 2003/05/20 08:12:36 perky Exp $
+# $Id: cp950.py,v 1.3 2003/05/26 15:28:27 perky Exp $
#
from cjkcodecs._cp950 import codec
1.3 +2 -2 cjkcodecs/cjkcodecs/euc_jp.py
Index: euc_jp.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/euc_jp.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- euc_jp.py 20 May 2003 08:12:36 -0000 1.2
+++ euc_jp.py 26 May 2003 15:28:27 -0000 1.3
@@ -1,4 +1,4 @@
-# ACHTUNG: This is generated file automatically. Please do not edit.
+# ACHTUNG: This file is generated automatically. Please do not edit.
#
# euc_jp.py: Python Unicode Codec for EUC_JP
#
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: euc_jp.py,v 1.2 2003/05/20 08:12:36 perky Exp $
+# $Id: euc_jp.py,v 1.3 2003/05/26 15:28:27 perky Exp $
#
from cjkcodecs._euc_jp import codec
1.3 +2 -2 cjkcodecs/cjkcodecs/euc_kr.py
Index: euc_kr.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/euc_kr.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- euc_kr.py 20 May 2003 08:12:36 -0000 1.2
+++ euc_kr.py 26 May 2003 15:28:27 -0000 1.3
@@ -1,4 +1,4 @@
-# ACHTUNG: This is generated file automatically. Please do not edit.
+# ACHTUNG: This file is generated automatically. Please do not edit.
#
# euc_kr.py: Python Unicode Codec for EUC_KR
#
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: euc_kr.py,v 1.2 2003/05/20 08:12:36 perky Exp $
+# $Id: euc_kr.py,v 1.3 2003/05/26 15:28:27 perky Exp $
#
from cjkcodecs._euc_kr import codec
1.3 +2 -2 cjkcodecs/cjkcodecs/gb18030.py
Index: gb18030.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/gb18030.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gb18030.py 20 May 2003 08:12:36 -0000 1.2
+++ gb18030.py 26 May 2003 15:28:27 -0000 1.3
@@ -1,4 +1,4 @@
-# ACHTUNG: This is generated file automatically. Please do not edit.
+# ACHTUNG: This file is generated automatically. Please do not edit.
#
# gb18030.py: Python Unicode Codec for GB18030
#
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: gb18030.py,v 1.2 2003/05/20 08:12:36 perky Exp $
+# $Id: gb18030.py,v 1.3 2003/05/26 15:28:27 perky Exp $
#
from cjkcodecs._gb18030 import codec
1.3 +2 -2 cjkcodecs/cjkcodecs/gb2312.py
Index: gb2312.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/gb2312.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gb2312.py 20 May 2003 08:12:36 -0000 1.2
+++ gb2312.py 26 May 2003 15:28:27 -0000 1.3
@@ -1,4 +1,4 @@
-# ACHTUNG: This is generated file automatically. Please do not edit.
+# ACHTUNG: This file is generated automatically. Please do not edit.
#
# gb2312.py: Python Unicode Codec for GB2312
#
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: gb2312.py,v 1.2 2003/05/20 08:12:36 perky Exp $
+# $Id: gb2312.py,v 1.3 2003/05/26 15:28:27 perky Exp $
#
from cjkcodecs._gb2312 import codec
1.2 +2 -2 cjkcodecs/cjkcodecs/gbk.py
Index: gbk.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/gbk.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gbk.py 20 May 2003 08:12:36 -0000 1.1
+++ gbk.py 26 May 2003 15:28:27 -0000 1.2
@@ -1,4 +1,4 @@
-# ACHTUNG: This is generated file automatically. Please do not edit.
+# ACHTUNG: This file is generated automatically. Please do not edit.
#
# gbk.py: Python Unicode Codec for GBK
#
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: gbk.py,v 1.1 2003/05/20 08:12:36 perky Exp $
+# $Id: gbk.py,v 1.2 2003/05/26 15:28:27 perky Exp $
#
from cjkcodecs._gbk import codec
1.2 +2 -2 cjkcodecs/cjkcodecs/shift_jis.py
Index: shift_jis.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/cjkcodecs/shift_jis.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shift_jis.py 20 May 2003 08:12:36 -0000 1.1
+++ shift_jis.py 26 May 2003 15:28:27 -0000 1.2
@@ -1,4 +1,4 @@
-# ACHTUNG: This is generated file automatically. Please do not edit.
+# ACHTUNG: This file is generated automatically. Please do not edit.
#
# shift_jis.py: Python Unicode Codec for SHIFT_JIS
#
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: shift_jis.py,v 1.1 2003/05/20 08:12:36 perky Exp $
+# $Id: shift_jis.py,v 1.2 2003/05/26 15:28:27 perky Exp $
#
from cjkcodecs._shift_jis import codec
|
|
From: Hye-Shik C. <pe...@us...> - 2003-05-26 15:08:50
|
perky 03/05/26 08:08:49
Modified: tests test_multibytecodec_support.py
Log:
Merge changes from iconv_codec.
Revision Changes Path
1.3 +66 -42 cjkcodecs/tests/test_multibytecodec_support.py
Index: test_multibytecodec_support.py
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/tests/test_multibytecodec_support.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- test_multibytecodec_support.py 26 May 2003 11:40:41 -0000 1.2
+++ test_multibytecodec_support.py 26 May 2003 15:08:49 -0000 1.3
@@ -27,7 +27,7 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $Id: test_multibytecodec_support.py,v 1.2 2003/05/26 11:40:41 perky Exp $
+# $Id: test_multibytecodec_support.py,v 1.3 2003/05/26 15:08:49 perky Exp $
#
import sys, codecs
@@ -68,47 +68,48 @@
else:
self.assertRaises(UnicodeError, func, source, scheme)
- def test_xmlcharrefreplace(self):
- if self.has_iso10646:
- return
-
- s = u"\u0b13\u0b23\u0b60 nd eggs"
- self.assertEqual(
- self.encode(s, "xmlcharrefreplace")[0],
- "ଓଣୠ nd eggs"
- )
-
- def test_customreplace(self):
- if self.has_iso10646:
- return
-
- import htmlentitydefs
-
- names = {}
- for (key, value) in htmlentitydefs.entitydefs.items():
- if len(value)==1:
- names[value.decode('latin-1')] = self.decode(key)[0]
- else:
- names[unichr(int(value[2:-1]))] = self.decode(key)[0]
-
- def xmlcharnamereplace(exc):
- if not isinstance(exc, UnicodeEncodeError):
- raise TypeError("don't know how to handle %r" % exc)
- l = []
- for c in exc.object[exc.start:exc.end]:
- try:
- l.append(u"&%s;" % names[c])
- except KeyError:
- l.append(u"&#%d;" % ord(c))
- return (u"".join(l), exc.end)
-
- codecs.register_error(
- "test.xmlcharnamereplace", xmlcharnamereplace)
-
- sin = u"\xab\u211c\xbb = \u2329\u1234\u232a"
- sout = "«ℜ» = ⟨ሴ⟩"
- self.assertEqual(self.encode(sin,
- "test.xmlcharnamereplace")[0], sout)
+ if sys.hexversion >= 0x02030000:
+ def test_xmlcharrefreplace(self):
+ if self.has_iso10646:
+ return
+
+ s = u"\u0b13\u0b23\u0b60 nd eggs"
+ self.assertEqual(
+ self.encode(s, "xmlcharrefreplace")[0],
+ "ଓଣୠ nd eggs"
+ )
+
+ def test_customreplace(self):
+ if self.has_iso10646:
+ return
+
+ import htmlentitydefs
+
+ names = {}
+ for (key, value) in htmlentitydefs.entitydefs.items():
+ if len(value)==1:
+ names[value.decode('latin-1')] = self.decode(key)[0]
+ else:
+ names[unichr(int(value[2:-1]))] = self.decode(key)[0]
+
+ def xmlcharnamereplace(exc):
+ if not isinstance(exc, UnicodeEncodeError):
+ raise TypeError("don't know how to handle %r" % exc)
+ l = []
+ for c in exc.object[exc.start:exc.end]:
+ try:
+ l.append(u"&%s;" % names[c])
+ except KeyError:
+ l.append(u"&#%d;" % ord(c))
+ return (u"".join(l), exc.end)
+
+ codecs.register_error(
+ "test.xmlcharnamereplace", xmlcharnamereplace)
+
+ sin = u"\xab\u211c\xbb = \u2329\u1234\u232a"
+ sout = "«ℜ» = ⟨ሴ⟩"
+ self.assertEqual(self.encode(sin,
+ "test.xmlcharnamereplace")[0], sout)
def test_streamreader(self):
UTF8Writer = codecs.lookup('utf-8')[3]
@@ -128,6 +129,29 @@
ostream.write(data)
self.assertEqual(ostream.getvalue(), self.tstring[1])
+
+ def test_streamwriter(self):
+ # We can't test with the real utf-8 StreamReader here.
+ # The standard SR.readline{,s} are mostly broken for multibyte seqs.
+ #UTF8Reader = codecs.lookup('utf-8')[2]
+ return
+ UTF8Reader = iconv_codec.lookup('utf-8')[2]
+ for name in ["read", "readline", "readlines"]:
+ for sizehint in [None, -1] + range(1, 33) + \
+ [64, 128, 256, 512, 1024]:
+ istream = UTF8Reader(StringIO(self.tstring[1]))
+ ostream = self.writer(StringIO())
+ func = getattr(istream, name)
+ while 1:
+ data = func(sizehint)
+ if not data:
+ break
+ if name == "readlines":
+ ostream.writelines(data)
+ else:
+ ostream.write(data)
+
+ self.assertEqual(ostream.getvalue(), self.tstring[0])
class TestBase_Mapping(unittest.TestCase):
pass_enctest = []
|
