Compatibility with Tidy 5.5.19 and newer

It changed how non existing files are handled. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910974
nijel · Oct 15, 2018 · 858cd3c · 858cd3c
1 parent eeb7c0f
commit 858cd3c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/tidy/lib.py b/tidy/lib.py
@@ -102,13 +102,18 @@ class ReportItem(object):
     """
     Error report item as returned by tidy.
 
-    :attribute severity: W, E or C indicating severity
+    :attribute severity: D, W, E or C indicating severity
     :attribute line: Line where error was fired (can be None)
     :attribute col: Column where error was fired (can be None)
     :attribute message: Error message itsef
     :attribute err: Whole error message as returned by tidy
     """
-    severities = {'W': 'Warning', 'E': 'Error', 'C': 'Config'}
+    severities = {
+        'W': 'Warning',
+        'E': 'Error',
+        'C': 'Config',
+        'D': 'Document',
+    }
 
     def __init__(self, err):
         # TODO - parse emacs mode

diff --git a/tidy/test_tidy.py b/tidy/test_tidy.py
@@ -52,10 +52,15 @@ def test_error_lines(self):
 
     def test_nonexisting(self):
         doc = tidy.parse(os.path.join(DATA_STORAGE, 'missing.html'))
-        self.assertEquals(str(doc), '')
+        self.assertEquals(str(doc).strip(), '')
         self.assertIn('missing.html', doc.errors[0].message)
-        self.assertEquals(doc.errors[0].severity, 'E')
-        self.assertTrue(str(doc.errors[0]).startswith('Error'))
+        if doc.errors[0].severity == 'E':
+            self.assertEquals(doc.errors[0].severity, 'E')
+            self.assertTrue(str(doc.errors[0]).startswith('Error'))
+        else:
+            # Tidy 5.5.19 and newer
+            self.assertEquals(doc.errors[0].severity, 'D')
+            self.assertTrue(str(doc.errors[0]).startswith('Document'))
 
     def test_options(self):
         doc1 = tidy.parseString(