Update of /cvsroot/pywebmail/webmail/webmail/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9380/webmail/server
Modified Files:
XSocketServer.py
Log Message:
standalone wsgi server
Index: XSocketServer.py
===================================================================
RCS file: /cvsroot/pywebmail/webmail/webmail/server/XSocketServer.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** XSocketServer.py 2 Mar 2008 17:04:33 -0000 1.4
--- XSocketServer.py 2 Mar 2008 18:00:03 -0000 1.5
***************
*** 1,3 ****
! import sys, time, logging
import socket, SocketServer
try: import signal
--- 1,3 ----
! import sys, time, logging, getopt
import socket, SocketServer
try: import signal
***************
*** 181,185 ****
optarg,mul = optarg[:-1],60*60*24
return int(optarg)*mul
! except e:
raise getopt.GetoptError, (str(e), 't')
--- 181,185 ----
optarg,mul = optarg[:-1],60*60*24
return int(optarg)*mul
! except (ValueError,TypeError), e:
raise getopt.GetoptError, (str(e), 't')
***************
*** 188,192 ****
if self.can_set_alarm():
alarm_opts = 't:'
! return 'vql:p'+alarm_opts
def parse_optlist(self, optlist):
--- 188,192 ----
if self.can_set_alarm():
alarm_opts = 't:'
! return 'vql:p:'+alarm_opts
def parse_optlist(self, optlist):
***************
*** 196,201 ****
if opt == '-l': self.host = optarg
if opt == '-p':
! try: self.port = int(optarg)
! except e: raise getopt.GetoptError, (str(e), 'p')
if opt == '-t':
self.alarm_time = self.parse_alarm_time(optarg)
--- 196,203 ----
if opt == '-l': self.host = optarg
if opt == '-p':
! try:
! self.port = int(optarg)
! except (ValueError,TypeError), e:
! raise getopt.GetoptError, (str(e), 'p')
if opt == '-t':
self.alarm_time = self.parse_alarm_time(optarg)
|
