Check for both stringtype and unicodetype to prevent future problems.

lib/python/ZServer/FCGIServer.py

@@ -45,8 +45,8 @@ import DebugLogger
 from cStringIO import StringIO
 from tempfile import TemporaryFile
 import socket, string, os, sys, time
-from types import StringType
 import thread
+from types import StringTypes
 
 tz_for_log = compute_timezone_for_log()
 
@@ -558,7 +558,7 @@ class FCGIChannel(asynchat.async_chat):
         self.closed=1
         while self.producer_fifo:
             p=self.producer_fifo.first()
-            if p is not None and type(p) != StringType:
+            if p is not None and not isinstance(p, StringTypes):
                 p.more() # free up resources held by producer
             self.producer_fifo.pop()
         asyncore.dispatcher.close(self)

lib/python/ZServer/HTTPServer.py

@@ -35,10 +35,10 @@ import sys
 import re
 import os
 import posixpath
-import types
 import thread
 import time
 import socket
+from types import StringTypes
 from cStringIO import StringIO
 
 from PubCore import handle
@@ -338,7 +338,7 @@ class zhttp_channel(http_channel):
             self.current_request=None
         while self.producer_fifo:
             p=self.producer_fifo.first()
-            if p is not None and type(p) != types.StringType:
+            if p is not None and not isinstance(p, StringTypes):
                 p.more() # free up resources held by producer
             self.producer_fifo.pop()
         dispatcher.close(self)

lib/python/ZServer/PCGIServer.py

@@ -47,7 +47,7 @@ import DebugLogger
 from cStringIO import StringIO
 from tempfile import TemporaryFile
 import socket, string, os, sys, time
-from types import StringType, TupleType
+from types import TupleType, StringTypes
 
 tz_for_log=compute_timezone_for_log()
 
@@ -203,7 +203,7 @@ class PCGIChannel(asynchat.async_chat):
         self.closed=1
         while self.producer_fifo:
             p=self.producer_fifo.first()
-            if p is not None and type(p) != StringType:
+            if p is not None and not isinstance(p, StringTypes):
                 p.more() # free up resources held by producer
             self.producer_fifo.pop()
         asyncore.dispatcher.close(self)