[Spambayes-checkins] spambayes pop3proxy.py,1.94,1.95

[Richie Hindle]

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

Modified Files:
	pop3proxy.py 
Log Message:
Fixed the horribly broken code that was just checked in by my evil twin.


Index: pop3proxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3proxy.py,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** pop3proxy.py	30 Aug 2003 22:27:44 -0000	1.94
--- pop3proxy.py	30 Aug 2003 22:45:04 -0000	1.95
***************
*** 93,96 ****
--- 93,97 ----
  from email.Header import Header
  
+ import smtpproxy
  import spambayes.message
  from spambayes import Dibbler
***************
*** 489,494 ****
                  messageText = "\r\n".join(headers) + "\r\n\r\n" + body
  
-                 crashMe()
- 
              except:
                  # Something nasty happened while parsing or classifying -
--- 490,493 ----
***************
*** 740,744 ****
      # SMTP proxy information in their configuration, then nothing will
      # happen.
-     import smtpproxy
      servers, proxyPorts = smtpproxy.LoadServerInfo()
      smtpproxy.CreateProxies(servers, proxyPorts, state)
--- 739,742 ----