# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1240595200 -7200
# Node ID 1367efbcd6a5a14e719d92f7c56cb84eed31b708
# Parent  93c6139139127dfaa4714c16f3eb00ae729ce19a# Parent  d3e3d527daf5a2c68d4207abe2cff55c25b6dcd1
merge

diff -r 93c613913912 -r 1367efbcd6a5 devtools/htmlparser.py
--- a/devtools/htmlparser.py	Fri Apr 24 19:46:21 2009 +0200
+++ b/devtools/htmlparser.py	Fri Apr 24 19:46:40 2009 +0200
@@ -32,10 +32,10 @@
 
     def preprocess_data(self, data):
         """used to fix potential blockquote mess generated by docutils"""
-        if STRICT_DOCTYPE not in data:
+        if str(STRICT_DOCTYPE) not in data:
             return data
         # parse using transitional DTD
-        data = data.replace(STRICT_DOCTYPE, TRANSITIONAL_DOCTYPE)
+        data = data.replace(str(STRICT_DOCTYPE), str(TRANSITIONAL_DOCTYPE))
         tree = etree.fromstring(data, self.parser)
         namespace = tree.nsmap.get(None)
         # this is the list of authorized child tags for <blockquote> nodes
@@ -51,7 +51,7 @@
             parent = blockquote.getparent()
             parent.remove(blockquote)
         data = etree.tostring(tree)
-        return '<?xml version="1.0" encoding="UTF-8"?>%s\n%s' % (STRICT_DOCTYPE, data)
+        return '<?xml version="1.0" encoding="UTF-8"?>%s\n%s' % (str(STRICT_DOCTYPE), data)
 
    
 class SaxOnlyValidator(Validator):