[PyWebMail-Checkins] webmail/webmail/server/pop3 __init__.py, 1.8, 1.9

[Michael D. <du...@us...>]

Update of /cvsroot/pywebmail/webmail/webmail/server/pop3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21993

Modified Files:
	__init__.py 
Log Message:
use new XSocketServer.MailboxesServerSetup

Index: __init__.py
===================================================================
RCS file: /cvsroot/pywebmail/webmail/webmail/server/pop3/__init__.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** __init__.py	26 Apr 2005 22:15:48 -0000	1.8
--- __init__.py	2 Mar 2008 17:05:31 -0000	1.9
***************
*** 24,28 ****
          global_command_factory, mailbox_command_factory)
  
! class ServerSetup(webmail.settings.MailboxesListSetup, webmail.server.XSocketServer.ServerSetup):
    enforce_server_style = 0
    cached_by_default = 1
--- 24,28 ----
          global_command_factory, mailbox_command_factory)
  
! class ServerSetup(webmail.server.XSocketServer.MailboxesServerSetup):
    enforce_server_style = 0
    cached_by_default = 1
***************
*** 39,44 ****
      self.local = None
      self.logfile = PausableOutput(sys.stderr)
!     webmail.settings.MailboxesListSetupMixin.__init__(self)
!     webmail.server.XSocketServer.ServerSetup.__init__(self, argv, progname)
  
    def auto_check_from_string(self, s):
--- 39,43 ----
      self.local = None
      self.logfile = PausableOutput(sys.stderr)
!     webmail.server.XSocketServer.MailboxesServerSetup.__init__(self, argv, progname)
  
    def auto_check_from_string(self, s):
***************
*** 53,58 ****
  
    def get_optdefs(self):
!     opts = 'vql:p:f:'
!     if not self.enforce_server_style:
        opts = opts+'cd'
      if not self.enforce_server_style or self.cached_by_default:
--- 52,60 ----
  
    def get_optdefs(self):
!     opts = webmail.server.XSocketServer.MailboxesServerSetup.get_optdefs(self)
!     if self.enforce_server_style:
!       # add hidden (not shown in help) option - same as forced style
!       opts = opts+'cd'[not self.cached_by_default]
!     else:
        opts = opts+'cd'
      if not self.enforce_server_style or self.cached_by_default:
***************
*** 64,69 ****
    def parse_optlist(self, optlist):
      for opt,optarg in optlist:
-       if opt == '-v': self.verbose = self.verbose+1
-       if opt == '-q': self.verbose = self.verbose-1
        if opt == '-c': self.cached = 1
        if opt == '-d': self.cached = 0
--- 66,69 ----
***************
*** 71,91 ****
        if opt == '-L': self.local = 1
        if opt == '-W': self.local = 0
!       if opt == '-f': self.config_file = optarg
!       if opt == '-l': self.host = optarg
!       if opt == '-p':
!         try: self.port = int(optarg)
!         except Exception, e: raise getopt.GetoptError, (str(e), 'p')
!       if opt == '-t':
!         self.alarm_time = self.parse_alarm_time(optarg)
  
    def get_usage_lines(self):
!     lines = []
!     lines.append('Usage: %s <options>...' % (self.argv[0],))
!     lines.append('Options:')
!     lines.append('  -v     Verbose')
!     lines.append('  -q     Quiet')
!     lines.append('  -l     Specify host address to listen at')
!     lines.append('  -p     Specify port')
!     lines.append('  -f cfg File to read configuration from')
      if not self.enforce_server_style:
        default = ['', '(default) '][self.cached_by_default]
--- 71,78 ----
        if opt == '-L': self.local = 1
        if opt == '-W': self.local = 0
!     webmail.server.XSocketServer.MailboxesServerSetup.parse_optlist(self, optlist)
  
    def get_usage_lines(self):
!     lines = webmail.server.XSocketServer.MailboxesServerSetup.get_usage_lines(self)
      if not self.enforce_server_style:
        default = ['', '(default) '][self.cached_by_default]
***************
*** 97,102 ****
        lines.append('  -o     Offline (don\'t automatically start autochecking)'+enforce)
        lines.append('  -L     Autocheck local mailboxes'+enforce)
-     if self.can_set_alarm():
-       lines.append('  -t     Stop after specified time (3600=3600s=60m=1h)')
      return lines
  
--- 84,87 ----
***************
*** 125,128 ****
--- 110,114 ----
    
    def setup_logging(self):
+     # this is needed for PausableOutput to work
      global logfile
      stdout,stderr = sys.stdout,sys.stderr