port all CMFDefault occurenceces

plone · Apr 24, 2015 · e9dfb56 · e9dfb56
1 parent dd06d74
commit e9dfb56
Show file tree

Hide file tree

Showing 6 changed files with 879 additions and 603 deletions.
diff --git a/Products/ATContentTypes/content/document.py b/Products/ATContentTypes/content/document.py
@@ -9,7 +9,7 @@
 from AccessControl import ClassSecurityInfo
 from ComputedAttribute import ComputedAttribute
 
-from Products.CMFDefault.utils import SimpleHTMLParser
+from lxml import etree
 from Products.GenericSetup.interfaces import IDAVAware
 
 from Products.Archetypes.atapi import Schema
@@ -216,10 +216,11 @@ def manage_afterPUT(self, data, marshall_data, file, context, mimetype,
             content = data
 
         if -1 != content.lower().find("<html"):
-            parser = SimpleHTMLParser()
-            parser.feed(content)
-            if parser.title:
-                self.setTitle(parser.title)
+            parser = etree.HTMLParser()
+            tree = etree.fromstring(content, parser=parser)
+            titletag = tree.xpath('//title')
+            if titletag:
+                self.setTitle(titletag[0].text)
             return
 
         ATCTContent.manage_afterPUT(self, data, marshall_data, file,