Mercurial > p > roundup > code
comparison roundup/mailgw.py @ 709:e40c7ccd036d
hrm
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Mon, 06 May 2002 23:40:07 +0000 |
| parents | 7ba403bffed5 |
| children | 69ba1e425924 |
comparison
equal
deleted
inserted
replaced
| 708:c0c896fc8284 | 709:e40c7ccd036d |
|---|---|
| 71 set() method to add the message to the item's spool; in the second case we | 71 set() method to add the message to the item's spool; in the second case we |
| 72 are calling the create() method to create a new node). If an auditor raises | 72 are calling the create() method to create a new node). If an auditor raises |
| 73 an exception, the original message is bounced back to the sender with the | 73 an exception, the original message is bounced back to the sender with the |
| 74 explanatory message given in the exception. | 74 explanatory message given in the exception. |
| 75 | 75 |
| 76 $Id: mailgw.py,v 1.69 2002-05-06 23:37:21 richard Exp $ | 76 $Id: mailgw.py,v 1.70 2002-05-06 23:40:07 richard Exp $ |
| 77 ''' | 77 ''' |
| 78 | 78 |
| 79 | 79 |
| 80 import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri | 80 import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri |
| 81 import time, random | 81 import time, random |
| 821 break | 821 break |
| 822 elif original_message.match(lines[0]): | 822 elif original_message.match(lines[0]): |
| 823 # ditch the stupid Outlook quoting of the entire original message | 823 # ditch the stupid Outlook quoting of the entire original message |
| 824 break | 824 break |
| 825 | 825 |
| 826 | |
| 826 # and add the section to the output | 827 # and add the section to the output |
| 827 l.append(section) | 828 l.append(section) |
| 828 # we only set content for those who want to delete cruft from the | 829 # we only set content for those who want to delete cruft from the |
| 829 # message body, otherwise the body is left untouched. | 830 # message body, otherwise the body is left untouched. |
| 830 if not keep_body: | 831 if not keep_body: |
| 831 content = '\n\n'.join(l) | 832 content = '\n\n'.join(l) |
| 832 return summary, content | 833 return summary, content |
| 833 | 834 |
| 834 # | 835 # |
| 835 # $Log: not supported by cvs2svn $ | 836 # $Log: not supported by cvs2svn $ |
| 837 # Revision 1.69 2002/05/06 23:37:21 richard | |
| 838 # Tweaking the signature deletion from mail messages. | |
| 839 # Added nuking of the "-----Original Message-----" crap from Outlook. | |
| 840 # | |
| 836 # Revision 1.68 2002/05/02 07:56:34 richard | 841 # Revision 1.68 2002/05/02 07:56:34 richard |
| 837 # . added option to automatically add the authors and recipients of messages | 842 # . added option to automatically add the authors and recipients of messages |
| 838 # to the nosy lists with the options ADD_AUTHOR_TO_NOSY (default 'new') and | 843 # to the nosy lists with the options ADD_AUTHOR_TO_NOSY (default 'new') and |
| 839 # ADD_RECIPIENTS_TO_NOSY (default 'new'). These settings emulate the current | 844 # ADD_RECIPIENTS_TO_NOSY (default 'new'). These settings emulate the current |
| 840 # behaviour. Setting them to 'yes' will add the author/recipients to the nosy | 845 # behaviour. Setting them to 'yes' will add the author/recipients to the nosy |