Mercurial > p > roundup > code
comparison roundup/mailgw.py @ 1961:8d3182e78ebc maint-0.6
merge from HEAD
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Fri, 19 Dec 2003 01:51:56 +0000 |
| parents | f686c73fc5d1 |
| children | f29a7edc31da |
comparison
equal
deleted
inserted
replaced
| 1958:267e4ba89b54 | 1961:8d3182e78ebc |
|---|---|
| 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.126 2003-06-25 08:02:51 neaj Exp $ | 76 $Id: mailgw.py,v 1.126.2.1 2003-12-19 01:51:56 richard Exp $ |
| 77 ''' | 77 """ |
| 78 | 78 |
| 79 import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri | 79 import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri |
| 80 import time, random, sys | 80 import time, random, sys |
| 81 import traceback, MimeWriter, rfc822 | 81 import traceback, MimeWriter, rfc822 |
| 82 | 82 |
| 709 args = m.group('args') | 709 args = m.group('args') |
| 710 if args: | 710 if args: |
| 711 errors, props = setPropArrayFromString(self, cl, args, nodeid) | 711 errors, props = setPropArrayFromString(self, cl, args, nodeid) |
| 712 # handle any errors parsing the argument list | 712 # handle any errors parsing the argument list |
| 713 if errors: | 713 if errors: |
| 714 errors = '\n- '.join(errors) | 714 errors = '\n- '.join(map(str, errors)) |
| 715 raise MailUsageError, ''' | 715 raise MailUsageError, ''' |
| 716 There were problems handling your subject line argument list: | 716 There were problems handling your subject line argument list: |
| 717 - %s | 717 - %s |
| 718 | 718 |
| 719 Subject was: "%s" | 719 Subject was: "%s" |