Fix up some bitrotted tests and documentation

foolip · foolip · commit 544017792353 · 2011-03-07T22:56:00.000+01:00
All sanitizer tests still error, but at least the script can be run. http://code.google.com/p/html5lib/issues/detail?id=179
diff --git a/README b/README
@@ -11,7 +11,7 @@ html5lib is packaged with distutils. To install it use:
 
 You may wish to check that your installation has been a success by
 running the testsuite. All the tests can be run by invoking
-runtests.py in the tests/ directory
+runtests.py in the html5lib/tests/ directory
 
  = Usage =
 
diff --git a/html5lib/tests/README b/html5lib/tests/README
@@ -1,3 +1,5 @@
-The testcases for the tokenizer require the use of simplejson
-(http://cheeseshop.python.org/pypi/simplejson). Each testcase file can be run
-directly through a python interpreter (e.g. python test_tokenizer.py). 
+Each testcase file can be run directly through a python interpreter
+(e.g. python test_tokenizer.py).
+
+Some testcases depend on the json module (available since Python 2.6),
+but will fall back to using simplejson if json is not available.
diff --git a/html5lib/tests/test_sanitizer.py b/html5lib/tests/test_sanitizer.py
@@ -1,14 +1,21 @@
-import os,sys,unittest
-from support import simplejson, html5lib_test_files
+import os
+import sys
+import unittest
 
+try:
+    import json
+except ImportError:
+    import simplejson as json
+
+from support import html5lib_test_files
 from html5lib import html5parser, sanitizer, constants
 
 class SanitizeTest(unittest.TestCase):
   def addTest(cls, name, expected, input):
     def test(self, expected=expected, input=input):
         expected = ''.join([token.toxml() for token in html5parser.HTMLParser().
           parseFragment(expected).childNodes])
-        expected = simplejson.loads(simplejson.dumps(expected))
+        expected = json.loads(json.dumps(expected))
         self.assertEqual(expected, self.sanitize_html(input))
     setattr(cls, name, test)
   addTest = classmethod(addTest)
@@ -73,7 +80,7 @@ def test_should_handle_astral_plane_characters(self):
 
 def buildTestSuite():
     for filename in html5lib_test_files("sanitizer"):
-        for test in simplejson.load(file(filename)):
+        for test in json.load(file(filename)):
           SanitizeTest.addTest('test_' + test['name'], test['output'], test['input'])
 
     return unittest.TestLoader().loadTestsFromTestCase(SanitizeTest)
