|
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.19 2002-01-05 02:19:03 richard Exp $ |
| 19 | +# $Id: roundup-mailgw,v 1.20 2002-01-07 10:43:48 richard Exp $ |
20 | 20 |
|
21 | 21 | # python version check |
22 | 22 | from roundup import version_check |
@@ -63,14 +63,18 @@ def do_mailbox(handler, filename): |
63 | 63 | def do_pop(handler, server, user='', password=''): |
64 | 64 | '''Read a series of messages from the specified POP server. |
65 | 65 | ''' |
66 | | - import getpass, poplib |
| 66 | + import getpass, poplib, socket |
67 | 67 | if not user: |
68 | 68 | user = raw_input(_('User: ')) |
69 | 69 | if not password: |
70 | 70 | password = getpass.getpass() |
71 | 71 |
|
72 | 72 | # open a connection to the server and retrieve all messages |
73 | | - server = poplib.POP3(server) |
| 73 | + try: |
| 74 | + server = poplib.POP3(server) |
| 75 | + except socket.error, message: |
| 76 | + print "POP server error:", message |
| 77 | + return 1 |
74 | 78 | server.user(user) |
75 | 79 | server.pass_(password) |
76 | 80 | numMessages = len(server.list()[1]) |
@@ -169,6 +173,9 @@ if __name__ == '__main__': |
169 | 173 |
|
170 | 174 | # |
171 | 175 | # $Log: not supported by cvs2svn $ |
| 176 | +# Revision 1.19 2002/01/05 02:19:03 richard |
| 177 | +# i18n'ification |
| 178 | +# |
172 | 179 | # Revision 1.18 2001/12/13 00:20:01 richard |
173 | 180 | # . Centralised the python version check code, bumped version to 2.1.1 (really |
174 | 181 | # needs to be 2.1.2, but that isn't released yet :) |
|
0 commit comments