Commit 945ec4b5 authored by Andreas Jung's avatar Andreas Jung

removed 'types' imports

parent ba603247
2.13 master x/poll y/cleanup-__del__ y/profile-fix 4.0a2 4.0a1 2.13.25 2.13.24 2.13.23 2.13.22 2.13.21 2.13.20 2.13.19 2.13.18 2.13.17 2.13.16 2.13.15 2.13.14 2.13.13 2.13.12 2.13.11 2.13.10 2.13.9 2.13.8 2.13.7 2.13.6 2.13.5 2.13.4 2.13.3 2.13.2 2.13.1 2.13.0 2.13.0c1 2.13.0b1 2.13.0a4 2.13.0a3 2.13.0a2 2.13.0a1 2.12.28 2.12.27 2.12.26 2.12.25 2.12.24 2.12.23 2.12.22 2.12.21 2.12.20 2.12.19 2.12.18 2.12.17 2.12.16 2.12.15 2.12.14 2.12.13 2.12.12 2.12.11 2.12.10 2.12.9 2.12.8 2.12.7 2.12.6 2.12.5 2.12.4 2.12.3 2.12.2 2.12.1 2.12.0 2.12.0c1 2.12.0b4 2.12.0b3 2.12.0b2 2.12.0b1 2.12.0a4 2.12.0a3 2.12.0a2 2.12.0a1 2.12-last-fulltree-revision 2.11.8 2.11.7 2.11.6 2.11.5 2.11.4 2.11.3 2.11.2 2.11.1 2.11.0 2.11.0c1 2.11.0b1 2.11.0a1 2.10.13 2.10.12 2.10.11 2.10.10 2.10.9 2.10.8 2.10.7 2.10.6 2.10.5 2.10.4 2.10.3 2.9.12 2.9.10 2.9.9 2.9.8 2.9.7 philikon-aq-checkpoint before-merging-console-scripts-branch backups/2.10-with-ZODB3.8@83153 backups/z4-zmi@124419 backups/witsch-zope2.11-with-standard-docutils@83154 backups/witsch-2.10-with-standard-docutils@76342 backups/tyam-unicodeSplitterPatch@104722 backups/tseaver-zope.app_delenda_est@110398 backups/tseaver-no_globals_imports@94459 backups/tseaver-instlib_as_site_dir@110397 backups/tseaver-clarify_install_docs@110394 backups/tseaver-2.11-no-z2-interfaces@110391 backups/shh-2.11-zopelitelayer@80865 backups/rochael-TM_sortKey@113726 backups/hannosch-dtml-vs-accesscontrol@113161 backups/gotcha-processlifetime@113938 backups/gotcha-LP143531@113945 backups/davisagli-copy-export@123222 backups/andig-catalog-report@115049 backups/ajung-2-11-prep-branch@82440 backups/acripps-resourceViewletDirective@75991
No related merge requests found
...@@ -46,7 +46,6 @@ from cStringIO import StringIO ...@@ -46,7 +46,6 @@ from cStringIO import StringIO
from tempfile import TemporaryFile from tempfile import TemporaryFile
import socket, string, os, sys, time import socket, string, os, sys, time
import thread import thread
from types import StringTypes
import base64 import base64
tz_for_log = compute_timezone_for_log() tz_for_log = compute_timezone_for_log()
...@@ -573,7 +572,7 @@ class FCGIChannel(asynchat.async_chat): ...@@ -573,7 +572,7 @@ class FCGIChannel(asynchat.async_chat):
self.closed=1 self.closed=1
while self.producer_fifo: while self.producer_fifo:
p=self.producer_fifo.first() 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 p.more() # free up resources held by producer
self.producer_fifo.pop() self.producer_fifo.pop()
asyncore.dispatcher.close(self) asyncore.dispatcher.close(self)
......
...@@ -29,7 +29,6 @@ from medusa import http_server ...@@ -29,7 +29,6 @@ from medusa import http_server
import asyncore import asyncore
from Producers import ShutdownProducer, LoggingProducer, CallbackProducer, \ from Producers import ShutdownProducer, LoggingProducer, CallbackProducer, \
file_part_producer, file_close_producer, iterator_producer file_part_producer, file_close_producer, iterator_producer
from types import LongType
import DebugLogger import DebugLogger
......
...@@ -38,7 +38,6 @@ import posixpath ...@@ -38,7 +38,6 @@ import posixpath
import thread import thread
import time import time
import socket import socket
from types import StringTypes
from cStringIO import StringIO from cStringIO import StringIO
from PubCore import handle from PubCore import handle
...@@ -383,7 +382,7 @@ class zhttp_channel(http_channel): ...@@ -383,7 +382,7 @@ class zhttp_channel(http_channel):
self.current_request=None self.current_request=None
while self.producer_fifo: while self.producer_fifo:
p=self.producer_fifo.first() 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 p.more() # free up resources held by producer
self.producer_fifo.pop() self.producer_fifo.pop()
dispatcher.close(self) dispatcher.close(self)
......
...@@ -47,7 +47,6 @@ import DebugLogger ...@@ -47,7 +47,6 @@ import DebugLogger
from cStringIO import StringIO from cStringIO import StringIO
from tempfile import TemporaryFile from tempfile import TemporaryFile
import socket, string, os, sys, time import socket, string, os, sys, time
from types import TupleType, StringTypes
tz_for_log=compute_timezone_for_log() tz_for_log=compute_timezone_for_log()
...@@ -163,7 +162,7 @@ class PCGIChannel(asynchat.async_chat): ...@@ -163,7 +162,7 @@ class PCGIChannel(asynchat.async_chat):
else: else:
method="GET" method="GET"
addr=self.addr addr=self.addr
if addr and type(addr) is TupleType: if addr and isinstance(addr, tuple):
self.server.logger.log ( self.server.logger.log (
addr[0], addr[0],
'%d - - [%s] "%s %s" %d %d "%s" "%s"' % ( '%d - - [%s] "%s %s" %d %d "%s" "%s"' % (
...@@ -203,7 +202,7 @@ class PCGIChannel(asynchat.async_chat): ...@@ -203,7 +202,7 @@ class PCGIChannel(asynchat.async_chat):
self.closed=1 self.closed=1
while self.producer_fifo: while self.producer_fifo:
p=self.producer_fifo.first() 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 p.more() # free up resources held by producer
self.producer_fifo.pop() self.producer_fifo.pop()
asyncore.dispatcher.close(self) asyncore.dispatcher.close(self)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment