Factor out the error message code, and make it work nicely under Py2

Author: gsnedders

html5lib/tests/support.py

@@ -133,3 +133,10 @@ def convertData(data):
     return convertData
 
 convertExpected = convert(2)
+
+def errorMessage(input, expected, actual):
+    msg = ("Input:\n%s\nExpected:\n%s\nRecieved\n%s\n" %
+           (repr(input), repr(expected), repr(actual)))
+    if sys.version_info.major == 2:
+        msg = msg.encode("ascii", "backslashreplace")
+    return msg

html5lib/tests/test_encoding.py

@@ -7,7 +7,7 @@
 except AttributeError:
     unittest.TestCase.assertEqual = unittest.TestCase.assertEquals
 
-from .support import get_data_files, TestData, test_dir
+from .support import get_data_files, TestData, test_dir, errorMessage
 from html5lib import HTMLParser, inputstream
 
 class Html5EncodingTestCase(unittest.TestCase):
@@ -28,23 +28,17 @@ def runParserEncodingTest(data, encoding):
     t = p.parse(data, useChardet=False)
     encoding = encoding.lower().decode("ascii")
 
-    errorMessage = ("Input:\n%s\nExpected:\n%s\nRecieved\n%s\n"%
-                    (data, repr(encoding), 
-                     repr(p.tokenizer.stream.charEncoding[0])))
-    assert encoding == p.tokenizer.stream.charEncoding[0], errorMessage
-
+    assert encoding == p.tokenizer.stream.charEncoding[0], errorMessage(data, encoding, p.tokenizer.stream.charEncoding[0])
 
 def runPreScanEncodingTest(data, encoding):
     stream = inputstream.HTMLBinaryInputStream(data, chardet=False)
     encoding = encoding.lower().decode("ascii")
 
+    # Very crude way to ignore irrelevant tests
     if len(data) > stream.numBytesMeta:
         return
 
-    errorMessage = ("Input:\n%s\nExpected:\n%s\nRecieved\n%s\n"%
-                    (data, repr(encoding), 
-                     repr(stream.charEncoding[0])))
-    assert encoding == stream.charEncoding[0], errorMessage
+    assert encoding == stream.charEncoding[0], errorMessage(data, encoding, stream.charEncoding[0])
 
 def test_encoding():
     for filename in get_data_files("encoding"):