77except AttributeError :
88unittest .TestCase .assertEqual = unittest .TestCase .assertEquals
99
10- from .support import get_data_files ,TestData ,test_dir
10+ from .support import get_data_files ,TestData ,test_dir , errorMessage
1111from html5lib import HTMLParser ,inputstream
1212
1313class Html5EncodingTestCase (unittest .TestCase ):
@@ -28,23 +28,17 @@ def runParserEncodingTest(data, encoding):
2828t = p .parse (data ,useChardet = False )
2929encoding = encoding .lower ().decode ("ascii" )
3030
31- errorMessage = ("Input:\n %s\n Expected:\n %s\n Recieved\n %s\n " %
32- (data ,repr (encoding ),
33- repr (p .tokenizer .stream .charEncoding [0 ])))
34- assert encoding == p .tokenizer .stream .charEncoding [0 ],errorMessage
35-
31+ assert encoding == p .tokenizer .stream .charEncoding [0 ],errorMessage (data ,encoding ,p .tokenizer .stream .charEncoding [0 ])
3632
3733def runPreScanEncodingTest (data ,encoding ):
3834stream = inputstream .HTMLBinaryInputStream (data ,chardet = False )
3935encoding = encoding .lower ().decode ("ascii" )
4036
37+ # Very crude way to ignore irrelevant tests
4138if len (data )> stream .numBytesMeta :
4239return
4340
44- errorMessage = ("Input:\n %s\n Expected:\n %s\n Recieved\n %s\n " %
45- (data ,repr (encoding ),
46- repr (stream .charEncoding [0 ])))
47- assert encoding == stream .charEncoding [0 ],errorMessage
41+ assert encoding == stream .charEncoding [0 ],errorMessage (data ,encoding ,stream .charEncoding [0 ])
4842
4943def test_encoding ():
5044for filename in get_data_files ("encoding" ):