diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-17 15:49:56 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-17 15:49:56 +0200 |
| commit | 0658bfff5f392f83d9ea19c2eb06862f0382337d (patch) | |
| tree | b036531c3818beee708e6efa87b1f5d497ddecea | |
| parent | 61736bc38c208cb5ad133f2845696356210e9e54 (diff) | |
| download | cpython-0658bfff5f392f83d9ea19c2eb06862f0382337d.tar.gz | |
Issue #12057: Fix .hgeol and test_multibytecodec_support for the conversion of
the CJK encoding testcase BLOB into multiple text files.
| -rw-r--r-- | .hgeol | 3 | ||||
| -rw-r--r-- | Lib/test/test_multibytecodec_support.py | 17 |
2 files changed, 14 insertions, 6 deletions
@@ -27,8 +27,9 @@ **.zip = BIN Lib/email/test/data/msg_26.txt = BIN -Lib/test/sndhdrdata/sndhdr.* = BIN +Lib/test/cjkencodings/* = BIN Lib/test/decimaltestdata/*.decTest = BIN +Lib/test/sndhdrdata/sndhdr.* = BIN # All other files (which presumably are human-editable) are "native". # This must be the last rule! diff --git a/Lib/test/test_multibytecodec_support.py b/Lib/test/test_multibytecodec_support.py index 0639032a2d..94529096d2 100644 --- a/Lib/test/test_multibytecodec_support.py +++ b/Lib/test/test_multibytecodec_support.py @@ -4,8 +4,11 @@ # Common Unittest Routines for CJK codecs # -import sys, codecs -import unittest, re +import codecs +import os +import re +import sys +import unittest from httplib import HTTPException from test import test_support from StringIO import StringIO @@ -326,6 +329,10 @@ class TestBase_Mapping(unittest.TestCase): self.fail('Decoding failed while testing %s -> %s: %s' % ( repr(csetch), repr(unich), exc.reason)) -def load_teststring(encoding): - from test import cjkencodings_test - return cjkencodings_test.teststring[encoding] +def load_teststring(name): + dir = os.path.join(os.path.dirname(__file__), 'cjkencodings') + with open(os.path.join(dir, name + '.txt'), 'rb') as f: + encoded = f.read() + with open(os.path.join(dir, name + '-utf8.txt'), 'rb') as f: + utf8 = f.read() + return encoded, utf8 |