|
16 | 16 | # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, |
17 | 17 | # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. |
18 | 18 | # |
19 | | -# $Id: roundup-mailgw,v 1.12 2001-11-08 05:16:55 richard Exp $ |
| 19 | +# $Id: roundup-mailgw,v 1.13 2001-11-09 01:05:55 richard Exp $ |
20 | 20 |
|
21 | | -import sys, os, re |
| 21 | +import sys, os, re, cStringIO |
22 | 22 | if int(sys.version[0]) < 2: |
23 | 23 | print "Roundup requires Python 2.0 or newer." |
24 | 24 | sys.exit(1) |
@@ -73,11 +73,20 @@ def do_pop(handler, server, user='', password=''): |
73 | 73 | server.user(user) |
74 | 74 | server.pass_(password) |
75 | 75 | numMessages = len(server.list()[1]) |
76 | | - for i in range(numMessages): |
77 | | - for j in server.retr(i+1)[1]: |
78 | | - s = cStringIO.StringIO('\n'.join(j)) |
79 | | - s.seek(0) |
80 | | - handler.handle_Message(Message(s)) |
| 76 | + for i in range(1, numMessages+1): |
| 77 | + # retr: returns |
| 78 | + # [ pop response e.g. '+OK 459 octets', |
| 79 | + # [ array of message lines ], |
| 80 | + # number of octets ] |
| 81 | + lines = server.retr(i)[1] |
| 82 | + s = cStringIO.StringIO('\n'.join(lines)) |
| 83 | + s.seek(0) |
| 84 | + handler.handle_Message(Message(s)) |
| 85 | + # delete the message |
| 86 | + server.dele(i) |
| 87 | + |
| 88 | + # quit the server to commit changes. |
| 89 | + server.quit() |
81 | 90 | return 0 |
82 | 91 |
|
83 | 92 | def usage(args, message=None): |
@@ -159,6 +168,10 @@ if __name__ == '__main__': |
159 | 168 |
|
160 | 169 | # |
161 | 170 | # $Log: not supported by cvs2svn $ |
| 171 | +# Revision 1.12 2001/11/08 05:16:55 richard |
| 172 | +# Rolled roundup-popgw into roundup-mailgw. Cleaned mailgw up significantly, |
| 173 | +# tested unix mailbox some more. POP still untested. |
| 174 | +# |
162 | 175 | # Revision 1.11 2001/11/07 05:32:58 richard |
163 | 176 | # More roundup-mailgw usage help. |
164 | 177 | # |
|
0 commit comments