[Erp5-report] r33337 nicolas - /erp5/trunk/products/PortalTransforms/transforms/safe_html.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed Mar  3 18:40:32 2010
New Revision: 33337

URL: http://svn.erp5.org?rev=33337&view=rev
Log:
Replace deprecated SGMLParser module in python2.6 by HTMLParser

Modified:
    erp5/trunk/products/PortalTransforms/transforms/safe_html.py

Modified: erp5/trunk/products/PortalTransforms/transforms/safe_html.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/transforms/safe_html.py?rev=33337&r1=33336&r2=33337&view=diff
==============================================================================
--- erp5/trunk/products/PortalTransforms/transforms/safe_html.py [utf8] (original)
+++ erp5/trunk/products/PortalTransforms/transforms/safe_html.py [utf8] Wed Mar  3 18:40:32 2010
@@ -1,5 +1,6 @@
+# -*- coding: utf-8 -*-
 import logging
-from sgmllib import SGMLParser
+from HTMLParser import HTMLParser
 import re
 from cgi import escape
 from zope.interface import implements
@@ -68,7 +69,7 @@
    except ValueError:
       return entity_value
 
-class StrippingParser(SGMLParser):
+class StrippingParser(HTMLParser):
     """Pass only allowed tags;  raise exception for known-bad.
 
     Copied from Products.CMFDefault.utils
@@ -78,7 +79,7 @@
     from htmlentitydefs import entitydefs # replace entitydefs from sgmllib
 
     def __init__(self, valid, nasty, remove_javascript, raise_error):
-        SGMLParser.__init__( self )
+        HTMLParser.__init__( self )
         self.result = []
         self.valid = valid
         self.nasty = nasty
@@ -111,7 +112,7 @@
 
         self.result.append('&%s%s' % (name, x))
 
-    def unknown_starttag(self, tag, attrs):
+    def handle_starttag(self, tag, attrs):
         """ Delete all tags except for legal ones.
         """
 
@@ -145,7 +146,7 @@
             # omit tag
             pass
 
-    def unknown_endtag(self, tag):
+    def handle_endtag(self, tag):
         if self.nasty.has_key(tag) and not self.valid.has_key(tag):
             self.suppress = False
         if self.suppress: return