removed 'types' imports

lib/python/ZServer/FCGIServer.py

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

lib/python/ZServer/HTTPResponse.py

@@ -29,7 +29,6 @@ from medusa import http_server
 import asyncore
 from Producers import ShutdownProducer, LoggingProducer, CallbackProducer, \
     file_part_producer, file_close_producer, iterator_producer
-from types import LongType
 import DebugLogger
 
 

lib/python/ZServer/HTTPServer.py

@@ -38,7 +38,6 @@ import posixpath
 import thread
 import time
 import socket
-from types import StringTypes
 from cStringIO import StringIO
 
 from PubCore import handle
@@ -383,7 +382,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 not isinstance(p, StringTypes):
+            if p is not None and not isinstance(p, basestring):
                 p.more() # free up resources held by producer
             self.producer_fifo.pop()
         dispatcher.close(self)

lib/python/ZServer/PCGIServer.py

@@ -47,7 +47,6 @@ import DebugLogger
 from cStringIO import StringIO
 from tempfile import TemporaryFile
 import socket, string, os, sys, time
-from types import TupleType, StringTypes
 
 tz_for_log=compute_timezone_for_log()
 
@@ -163,7 +162,7 @@ class PCGIChannel(asynchat.async_chat):
         else:
             method="GET"
         addr=self.addr
-        if addr and type(addr) is TupleType:
+        if addr and isinstance(addr, tuple):
             self.server.logger.log (
                 addr[0],
                 '%d - - [%s] "%s %s" %d %d "%s" "%s"' % (
@@ -203,7 +202,7 @@ class PCGIChannel(asynchat.async_chat):
         self.closed=1
         while self.producer_fifo:
             p=self.producer_fifo.first()
-            if p is not None and not isinstance(p, StringTypes):
+            if p is not None and not isinstance(p, basestring):
                 p.more() # free up resources held by producer
             self.producer_fifo.pop()
         asyncore.dispatcher.close(self)