Update of /cvsroot/webware/Webware/WebKit/Adapters
In directory sc8-pr-cvs1:/tmp/cvs-serv9802/WebKit/Adapters
Modified Files:
HTTPAdapter.py
Log Message:
Tabnanny revealed a number of files with mixed space and tab indentation.
I've converted them to use tabs only, as required by the Webware style
guidelines.
Index: HTTPAdapter.py
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Adapters/HTTPAdapter.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HTTPAdapter.py 3 Nov 2002 02:48:03 -0000 1.1
--- HTTPAdapter.py 27 Jan 2003 16:06:09 -0000 1.2
***************
*** 18,22 ****
if not WebwareDir:
WebwareDir = os.path.dirname(os.path.dirname(os.getcwd()))
! sys.path.insert(0, WebwareDir)
webKitDir = os.path.join(WebwareDir, 'WebKit')
if AppWorkDir is None:
--- 18,22 ----
if not WebwareDir:
WebwareDir = os.path.dirname(os.path.dirname(os.getcwd()))
! sys.path.insert(0, WebwareDir)
webKitDir = os.path.join(WebwareDir, 'WebKit')
if AppWorkDir is None:
***************
*** 26,39 ****
from WebKit.Adapters.Adapter import Adapter
! (host, port) = string.split(open(os.path.join(webKitDir, 'address.text')).read(), ':')
! if os.name=='nt' and host=='':
# MS Windows doesn't like a blank host name
host = 'localhost'
! port = int(port)
except 0:
! ## @@: Is there something we should do with exceptions here?
! ## I'm apt to just let them print to stderr and quit like normal,
! ## but I'm not sure.
! pass
--- 26,39 ----
from WebKit.Adapters.Adapter import Adapter
! (host, port) = string.split(open(os.path.join(webKitDir, 'address.text')).read(), ':')
! if os.name=='nt' and host=='':
# MS Windows doesn't like a blank host name
host = 'localhost'
! port = int(port)
except 0:
! ## @@: Is there something we should do with exceptions here?
! ## I'm apt to just let them print to stderr and quit like normal,
! ## but I'm not sure.
! pass
***************
*** 47,108 ****
class HTTPAdapter(HTTPHandler, Adapter):
! def __init__(self, *vars):
! Adapter.__init__(self, webKitDir)
! HTTPHandler.__init__(self, *vars)
! def doTransaction(self, env, myInput):
! self.transactWithAppServer(env, myInput, host, port)
class ThreadedHTTPServer(BaseHTTPServer.HTTPServer):
! """
! A threaded version of BaseHTTPServer.
!
! Model taken from a 2001 comp.lang.python post by Michael Abbott.
! """
! def __init__(self, *args):
! self._threads = {}
! self._threadID = 1
! BaseHTTPServer.HTTPServer.__init__(self, *args)
! def handle_request(self):
! try:
! request, client_address = self.get_request()
! except socket.error:
! return
! t = threading.Thread(target=self.handle_request_body,
! args=(request, client_address, self._threadID))
! t.start()
! self._threads[self._threadID] = t
! self._threadID += 1
!
! # This part of the processing is run in its own thread
! def handle_request_body(self, request, client_address, threadID):
! if self.verify_request(request, client_address):
! try:
! self.process_request(request, client_address)
! except:
! self.handle_error(request, client_address)
! self.close_request(request)
! del self._threads[threadID]
! def serve_forever(self):
! self._keepGoing = 1
! while self._keepGoing:
! self.handle_request()
! self.socket.close()
! def shutDown(self):
! self._keepGoing = 0
! for thread in self._threads.values():
! thread.join()
! self.socket.shutdown(2)
! self.socket.close()
def run(serverAddress, klass=HTTPHandler):
! httpd = ThreadedHTTPServer(serverAddress, klass)
! httpd.serve_forever()
--- 47,108 ----
class HTTPAdapter(HTTPHandler, Adapter):
! def __init__(self, *vars):
! Adapter.__init__(self, webKitDir)
! HTTPHandler.__init__(self, *vars)
! def doTransaction(self, env, myInput):
! self.transactWithAppServer(env, myInput, host, port)
class ThreadedHTTPServer(BaseHTTPServer.HTTPServer):
! """
! A threaded version of BaseHTTPServer.
!
! Model taken from a 2001 comp.lang.python post by Michael Abbott.
! """
! def __init__(self, *args):
! self._threads = {}
! self._threadID = 1
! BaseHTTPServer.HTTPServer.__init__(self, *args)
! def handle_request(self):
! try:
! request, client_address = self.get_request()
! except socket.error:
! return
! t = threading.Thread(target=self.handle_request_body,
! args=(request, client_address, self._threadID))
! t.start()
! self._threads[self._threadID] = t
! self._threadID += 1
!
! # This part of the processing is run in its own thread
! def handle_request_body(self, request, client_address, threadID):
! if self.verify_request(request, client_address):
! try:
! self.process_request(request, client_address)
! except:
! self.handle_error(request, client_address)
! self.close_request(request)
! del self._threads[threadID]
! def serve_forever(self):
! self._keepGoing = 1
! while self._keepGoing:
! self.handle_request()
! self.socket.close()
! def shutDown(self):
! self._keepGoing = 0
! for thread in self._threads.values():
! thread.join()
! self.socket.shutdown(2)
! self.socket.close()
def run(serverAddress, klass=HTTPHandler):
! httpd = ThreadedHTTPServer(serverAddress, klass)
! httpd.serve_forever()
***************
*** 113,147 ****
usage = """HTTPServer - Standalone HTTP server to connect to AppServer
Usage:
! python HTTPServer.py [OPTIONS]
Options:
! -p PORT Port to connect to (default: 80)
! -h HOST Host to server from (for computers with multiple
! interfaces, default 127.0.0.1)
! -d Run as daemon
"""
def main():
! import getopt
! try:
! opts, args = getopt.getopt(sys.argv[1:], 'p:h:d',
! ['port=', 'host=', 'daemon'])
! except getopt.GetoptErrro:
! print usage
! sys.exit(2)
! for o, a in opts:
! if o in ('-p', '--port'):
! port = int(a)
! elif o in ('-h', '--host'):
! host = a
! elif o in ('-d', '--daemon'):
! daemon = 1
! if daemon:
! if os.fork() or os.fork():
! sys.exit(0)
! print "PS: This adapter is experimental and should not be used in\na production environment"
! run()
if __name__ == '__main__':
! main()
--- 113,147 ----
usage = """HTTPServer - Standalone HTTP server to connect to AppServer
Usage:
! python HTTPServer.py [OPTIONS]
Options:
! -p PORT Port to connect to (default: 80)
! -h HOST Host to server from (for computers with multiple
! interfaces, default 127.0.0.1)
! -d Run as daemon
"""
def main():
! import getopt
! try:
! opts, args = getopt.getopt(sys.argv[1:], 'p:h:d',
! ['port=', 'host=', 'daemon'])
! except getopt.GetoptErrro:
! print usage
! sys.exit(2)
! for o, a in opts:
! if o in ('-p', '--port'):
! port = int(a)
! elif o in ('-h', '--host'):
! host = a
! elif o in ('-d', '--daemon'):
! daemon = 1
! if daemon:
! if os.fork() or os.fork():
! sys.exit(0)
! print "PS: This adapter is experimental and should not be used in\na production environment"
! run()
if __name__ == '__main__':
! main()
|