[svn r3717] r4275@delle: sbehnel | 2008-05-21 20:06:26 +0200

 lots pf Py3 fixes and work-arounds

--HG--
branch : trunk

1 files changed, 7 insertions, 2 deletions

diff --git a/src/lxml/html/diff.py b/src/lxml/html/diff.py
index e0b333db..3b3ad8e7 100644
--- a/src/lxml/html/diff.py
+++ b/src/lxml/html/diff.py
@@ -11,6 +11,11 @@ try:
 except NameError:
     # Python 3
     _unicode = str
+try:
+    basestring = __builtins__["basestring"]
+except (KeyError, NameError):
+    # Python 3
+    basestring = str
 
 ############################################################
 ## Annotation
@@ -748,9 +753,9 @@ def serialize_html_fragment(el, skip_outer=False):
     html = etree.tostring(el, method="html", encoding="UTF-8")
     if skip_outer:
         # Get rid of the extra starting tag:
-        html = html[html.find('>')+1:]
+        html = html[html.find('>'.encode("ASCII"))+1:]
         # Get rid of the extra end tag:
-        html = html[:html.rfind('<')]
+        html = html[:html.rfind('<'.encode("ASCII"))]
         return html.strip()
     else:
         return html