[Lxml-checkins] r43950 - lxml/branch/html/src/lxml

[ianb at codespeak.net]

Author: ianb
Date: Thu May 31 23:54:18 2007
New Revision: 43950

Modified:
   lxml/branch/html/src/lxml/doctestcompare.py
Log:
Fix for problem with HTML-as-a-function and that it then looks like a method to the LHTMLOutputChecker class

Modified: lxml/branch/html/src/lxml/doctestcompare.py
==============================================================================
--- lxml/branch/html/src/lxml/doctestcompare.py	(original)
+++ lxml/branch/html/src/lxml/doctestcompare.py	Thu May 31 23:54:18 2007
@@ -48,7 +48,8 @@
         'param', 'img', 'area', 'br', 'basefont', 'input',
         'base', 'meta', 'link', 'col')
 
-    default_parser = etree.XML
+    def get_default_parser(self):
+        return etree.XML
 
     def check_output(self, want, got, optionflags):
         alt_self = getattr(self, '_temp_override_self', None)
@@ -80,7 +81,7 @@
         elif want.strip().lower().startswith('<html'):
             parser = HTML
         elif want.strip().startswith('<'):
-            parser = self.default_parser
+            parser = self.get_default_parser()
         return parser
 
     def compare_docs(self, want, got):
@@ -146,7 +147,7 @@
                 return '\n'.join(errors)
             else:
                 return value
-        html = parser is etree.HTML
+        html = parser is HTML
         diff_parts = []
         diff_parts.append('Expected:')
         diff_parts.append(self.format_doc(want_doc, html, 2))
@@ -300,7 +301,8 @@
         return self.format_text(text, strip)
 
 class LHTMLOutputChecker(LXMLOutputChecker):
-    default_parser = HTML
+    def get_default_parser(self):
+        return HTML
     
 def install(html=False):
     """