py3: TODO py3-only?.

product/PortalTransforms/libtransforms/utils.py

 import re
 import os
 import sys
-from sgmllib import SGMLParser, SGMLParseError
+# XXX-zope4py3: sgmllib removed from standard library in favor of
+# html.parser.HTMLParser
+#from sgmllib import SGMLParser, SGMLParseError
 
 try:
     # Need to be imported before win32api to avoid dll loading
@@ -142,95 +144,95 @@ NASTY_TAGS = { 'script'     : 1
 class IllegalHTML( ValueError ):
     pass
 
-class StrippingParser( SGMLParser ):
-    """ Pass only allowed tags;  raise exception for known-bad.  """
+# class StrippingParser( SGMLParser ):
+#     """ Pass only allowed tags;  raise exception for known-bad.  """
 
-    from htmlentitydefs import entitydefs # replace entitydefs from sgmllib
+#     from html.entities import entitydefs # replace entitydefs from sgmllib
 
-    def __init__( self ):
+#     def __init__( self ):
 
-        SGMLParser.__init__( self )
-        self.result = ""
+#         SGMLParser.__init__( self )
+#         self.result = ""
 
-    def handle_data( self, data ):
+#     def handle_data( self, data ):
 
-        if data:
-            self.result = self.result + data
+#         if data:
+#             self.result = self.result + data
 
-    def handle_charref( self, name ):
+#     def handle_charref( self, name ):
 
-        self.result = "%s&#%s;" % ( self.result, name )
+#         self.result = "%s&#%s;" % ( self.result, name )
 
-    def handle_entityref(self, name):
+#     def handle_entityref(self, name):
 
-        if self.entitydefs.has_key(name):
-            x = ';'
-        else:
-            # this breaks unstandard entities that end with ';'
-            x = ''
+#         if name in self.entitydefs:
+#             x = ';'
+#         else:
+#             # this breaks unstandard entities that end with ';'
+#             x = ''
 
-        self.result = "%s&%s%s" % (self.result, name, x)
+#         self.result = "%s&%s%s" % (self.result, name, x)
 
-    def unknown_starttag(self, tag, attrs):
+#     def unknown_starttag(self, tag, attrs):
 
-        """ Delete all tags except for legal ones.
-        """
-        if VALID_TAGS.has_key(tag):
+#         """ Delete all tags except for legal ones.
+#         """
+#         if tag in VALID_TAGS:
 
-            self.result = self.result + '<' + tag
+#             self.result = self.result + '<' + tag
 
-            for k, v in attrs:
+#             for k, v in attrs:
 
-                if k.lower().startswith( 'on' ):
-                    raise IllegalHTML('Javascipt event "%s" not allowed.' % k)
+#                 if k.lower().startswith( 'on' ):
+#                     raise IllegalHTML('Javascipt event "%s" not allowed.' % k)
 
-                if v.lower().startswith( 'javascript:' ):
-                    raise IllegalHTML('Javascipt URI "%s" not allowed.' % v)
+#                 if v.lower().startswith( 'javascript:' ):
+#                     raise IllegalHTML('Javascipt URI "%s" not allowed.' % v)
 
-                self.result = '%s %s="%s"' % (self.result, k, v)
+#                 self.result = '%s %s="%s"' % (self.result, k, v)
 
-            endTag = '</%s>' % tag
-            if VALID_TAGS.get(tag):
-                self.result = self.result + '>'
-            else:
-                self.result = self.result + ' />'
+#             endTag = '</%s>' % tag
+#             if VALID_TAGS.get(tag):
+#                 self.result = self.result + '>'
+#             else:
+#                 self.result = self.result + ' />'
 
-        elif NASTY_TAGS.get( tag ):
-            raise IllegalHTML('Dynamic tag "%s" not allowed.' % tag)
+#         elif NASTY_TAGS.get( tag ):
+#             raise IllegalHTML('Dynamic tag "%s" not allowed.' % tag)
 
-        else:
-            pass    # omit tag
+#         else:
+#             pass    # omit tag
 
-    def unknown_endtag(self, tag):
+#     def unknown_endtag(self, tag):
 
-        if VALID_TAGS.get( tag ):
+#         if VALID_TAGS.get( tag ):
 
-            self.result = "%s</%s>" % (self.result, tag)
-            remTag = '</%s>' % tag
+#             self.result = "%s</%s>" % (self.result, tag)
+#             remTag = '</%s>' % tag
 
-    def parse_declaration(self, i):
-        """Fix handling of CDATA sections. Code borrowed from BeautifulSoup.
-        """
-        j = None
-        if self.rawdata[i:i+9] == '<![CDATA[':
-             k = self.rawdata.find(']]>', i)
-             if k == -1:
-                 k = len(self.rawdata)
-             data = self.rawdata[i+9:k]
-             j = k+3
-             self.result.append("<![CDATA[%s]]>" % data)
-        else:
-            try:
-                j = SGMLParser.parse_declaration(self, i)
-            except SGMLParseError:
-                toHandle = self.rawdata[i:]
-                self.result.append(toHandle)
-                j = i + len(toHandle)
-        return j
-
-def scrubHTML( html ):
-    """ Strip illegal HTML tags from string text.  """
-    parser = StrippingParser()
-    parser.feed( html )
-    parser.close()
-    return parser.result
+#     def parse_declaration(self, i):
+#         """Fix handling of CDATA sections. Code borrowed from BeautifulSoup.
+#         """
+#         j = None
+#         if self.rawdata[i:i+9] == '<![CDATA[':
+#              k = self.rawdata.find(']]>', i)
+#              if k == -1:
+#                  k = len(self.rawdata)
+#              data = self.rawdata[i+9:k]
+#              j = k+3
+#              self.result.append("<![CDATA[%s]]>" % data)
+#         else:
+#             try:
+#                 j = SGMLParser.parse_declaration(self, i)
+#             except SGMLParseError:
+#                 toHandle = self.rawdata[i:]
+#                 self.result.append(toHandle)
+#                 j = i + len(toHandle)
+#         return j
+
+# def scrubHTML( html ):
+#     """ Strip illegal HTML tags from string text.  """
+#     parser = StrippingParser()
+#     parser.feed( html )
+#     parser.close()
+#     return parser.result

product/TimerService/timerserver/TimerServer.py

@@ -26,30 +26,11 @@ class TimerServer(threading.Thread):
                     interval)
 
     def run(self):
-        try:
-            zopewsgi = sys.modules['Products.ERP5.bin.zopewsgi']
-        except KeyError:
-            # wait until the zhttp_server exist in socket_map
-            # because TimerService has to be started after the Zope HTTPServer
-            from asyncore import socket_map
-            ip = port = ''
-            while 1:
-                time.sleep(5)
-                for k, v in socket_map.items():
-                    if hasattr(v, 'addr'):
-                        # see Zope/lib/python/App/ApplicationManager.py: def getServers(self)
-                        type = str(getattr(v, '__class__', 'unknown'))
-                        if type == 'ZServer.HTTPServer.zhttp_server':
-                            ip, port = v.addr
-                            break
-                if port:
-                    break
-            from ZServer.PubCore import handle
-        else:
+        import Products.ERP5.bin.zopewsgi
         while 1:
             time.sleep(5)
             try:
-                    server = zopewsgi.server
+                server = Products.ERP5.bin.zopewsgi.server
                 break
             except AttributeError:
                 pass
@@ -59,7 +40,7 @@ class TimerServer(threading.Thread):
 
         class handle(object):
             def __init__(self, module_name, request, response):
-                    self.service = partial(zopewsgi.publish_module,
+                self.service = partial(Products.ERP5.bin.zopewsgi.publish_module,
                     request.environ,
                     start_response,
                     _module_name=module_name,

product/TimerService/timerserver/component.xml

-<component>
-  <import package="ZServer" />
-  
-  <sectiontype name="timer-server"
-               datatype="Products.TimerService.timerserver.TimerServerFactory"
-               implements="ZServer.server">
-    <key name="interval" datatype="float" default="600">
-      <description>
-	Interval in seconds. Supports fractions of a second.
-      </description>
-    </key>
-  </sectiontype>
-
-</component>

product/ZSQLCatalog/SearchText/AdvancedSearchTextParser.py

@@ -41,7 +41,7 @@ except ImportError:
   IColumnNode = None
   def verifyClass(*args, **kw):
     pass
-  implements = verifyClass
+  implements = verifyClass # XXX need to be reviewed as it is decorator now
 
 @implementer(INode)
 class Node(object):