[Spambayes-checkins] spambayes pop3proxy.py,1.55,1.56

[Tim Stone]

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

Modified Files:
	pop3proxy.py 
Log Message:
Fix for bug 693423, digest message crashes review page creation

Index: pop3proxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3proxy.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** pop3proxy.py	27 Feb 2003 04:13:31 -0000	1.55
--- pop3proxy.py	28 Feb 2003 04:19:20 -0000	1.56
***************
*** 841,847 ****
              except StopIteration:
                  text = '(this message has no text body)'
!         text = text.replace(' ', ' ')      # Else they'll be quoted
!         text = re.sub(r'(\s)\s+', r'\1', text)  # Eg. multiple blank lines
!         text = text.strip()
  
          class _MessageInfo:
--- 841,850 ----
              except StopIteration:
                  text = '(this message has no text body)'
!         if type(text) == type([]):  # gotta be a 'right' way to do this
!             text = "(this message is a digest of %s messages)" % (len(text))
!         else:
!             text = text.replace(' ', ' ')      # Else they'll be quoted
!             text = re.sub(r'(\s)\s+', r'\1', text)  # Eg. multiple blank lines
!             text = text.strip()
  
          class _MessageInfo: