[Spambayes-checkins] spambayes pop3proxy.py,1.26,1.27

[Richie Hindle]

Update of /cvsroot/spambayes/spambayes
In directory sc8-pr-cvs1:/tmp/cvs-serv15947

Modified Files:
	pop3proxy.py 
Log Message:
 o Fixed Tim Stone's hanging problem - "LIST 1" would hang
   because it thought that the response should be multiline (I
   don't like nested scopes 8-)
 o Don't allow the radio buttons headers in the training interface
   to word wrap.
 o When the POP3 server is unreachable, return an error to the
   email client as well as printing it to the console.


Index: pop3proxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3proxy.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** pop3proxy.py	27 Nov 2002 18:44:41 -0000	1.26
--- pop3proxy.py	28 Nov 2002 16:10:46 -0000	1.27
***************
*** 14,22 ****
          options:
              -z      : Runs a self-test and exits.
!             -t      : Runs a test POP3 server on port 8110 (for testing).
              -h      : Displays this help message.
  
!             -p FILE : use the named data file
!             -d      : the file is a DBM file rather than a pickle
              -l port : proxy listens on this port number (default 110)
              -u port : User interface listens on this port number
--- 14,22 ----
          options:
              -z      : Runs a self-test and exits.
!             -t      : Runs a fake POP3 server on port 8110 (for testing).
              -h      : Displays this help message.
  
!             -p FILE : use the named database file
!             -d      : the database is a DBM file rather than a pickle
              -l port : proxy listens on this port number (default 110)
              -u port : User interface listens on this port number
***************
*** 25,30 ****
  
          All command line arguments and switches take their default
!         values from the [Hammie], [pop3proxy] and [html_ui] sections
!         of bayescustomize.ini.
  
  For safety, and to help debugging, the whole POP3 conversation is
--- 25,30 ----
  
          All command line arguments and switches take their default
!         values from the [pop3proxy] and [html_ui] sections of
!         bayescustomize.ini.
  
  For safety, and to help debugging, the whole POP3 conversation is
***************
*** 40,44 ****
  
  __author__ = "Richie Hindle <richie@entrian.com>"
! __credits__ = "Tim Peters, Neale Pickett, all the spambayes contributors."
  
  try:
--- 40,44 ----
  
  __author__ = "Richie Hindle <richie@entrian.com>"
! __credits__ = "Tim Peters, Neale Pickett, Tim Stone, all the Spambayes folk."
  
  try:
***************
*** 56,59 ****
--- 56,61 ----
   o Review already-trained messages, and purge them.
   o Put in a link to view a message (plain text, html, multipart...?)
+    Include a Reply link that launches the registered email client, eg.
+    mailto:tim@fourstonesExpressions.com?subject=Re:%20pop3proxy&body=Hi%21%0D
   o Keyboard navigation (David Ascher).  But aren't Tab and left/right
     arrow enough?
***************
*** 130,133 ****
--- 132,139 ----
  take weeks over a modem - I've already had problems with clients timing
  out while the proxy was downloading stuff from the server).
+ 
+ Adam's idea: add checkboxes to a Google results list for "Relevant" /
+ "Irrelevant", then submit that to build a search including the
+ highest-scoring tokens and excluding the lowest-scoring ones.
  """
  
***************
*** 214,221 ****
              self.connect((serverName, serverPort))
          except socket.error, e:
!             print >>sys.stderr, "Can't connect to %s:%d: %s" % \
!                                 (serverName, serverPort, e)
!             self.close()
              self.lineCallback('')   # "The socket's been closed."
  
      def collect_incoming_data(self, data):
--- 220,228 ----
              self.connect((serverName, serverPort))
          except socket.error, e:
!             error = "Can't connect to %s:%d: %s" % (serverName, serverPort, e)
!             print >>sys.stderr, error
!             self.lineCallback('-ERR %s\r\n' % error)
              self.lineCallback('')   # "The socket's been closed."
+             self.close()
  
      def collect_incoming_data(self, data):
***************
*** 304,308 ****
              return True
          elif self.command in ['LIST', 'UIDL']:
!             return len(args) == 0
          else:
              # Assume that an unknown command will get a single-line
--- 311,315 ----
              return True
          elif self.command in ['LIST', 'UIDL']:
!             return len(self.args) == 0
          else:
              # Assume that an unknown command will get a single-line
***************
*** 710,714 ****
          """<tr><td><b>Messages classified as %s:</b></td>
            <td><b>From:</b></td>
!           <td class='reviewheaders'><b>
                <a href='javascript: onHeader("%s", "Discard");'>Discard</a> /
                <a href='javascript: onHeader("%s", "Defer");'>Defer</a> /
--- 717,721 ----
          """<tr><td><b>Messages classified as %s:</b></td>
            <td><b>From:</b></td>
!           <td class='reviewheaders' nowrap><b>
                <a href='javascript: onHeader("%s", "Discard");'>Discard</a> /
                <a href='javascript: onHeader("%s", "Defer");'>Defer</a> /