Mercurial > p > roundup > code
comparison roundup/mailgw.py @ 6638:e1588ae185dc issue2550923_computed_property
merge from default branch. Fix travis.ci so CI builds don't error out
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Thu, 21 Apr 2022 16:54:17 -0400 |
| parents | 3e8f2104753b |
| children | 408fd477761f |
comparison
equal
deleted
inserted
replaced
| 6508:85db90cc1705 | 6638:e1588ae185dc |
|---|---|
| 110 from roundup.mailer import Mailer | 110 from roundup.mailer import Mailer |
| 111 from roundup.i18n import _ | 111 from roundup.i18n import _ |
| 112 from roundup.hyperdb import iter_roles | 112 from roundup.hyperdb import iter_roles |
| 113 from roundup.anypy.strings import StringIO, b2s, u2s | 113 from roundup.anypy.strings import StringIO, b2s, u2s |
| 114 import roundup.anypy.random_ as random_ | 114 import roundup.anypy.random_ as random_ |
| 115 import roundup.anypy.ssl_ as ssl_ | |
| 115 | 116 |
| 116 try: | 117 try: |
| 117 import gpg, gpg.core, gpg.constants, gpg.constants.sigsum | 118 import gpg, gpg.core, gpg.constants, gpg.constants.sigsum |
| 118 except ImportError: | 119 except ImportError: |
| 119 gpg = None | 120 gpg = None |
| 1371 self.logger.debug('Trying server %r with ssl' % server) | 1372 self.logger.debug('Trying server %r with ssl' % server) |
| 1372 server = imaplib.IMAP4_SSL(server) | 1373 server = imaplib.IMAP4_SSL(server) |
| 1373 else: | 1374 else: |
| 1374 self.logger.debug('Trying server %r without ssl' % server) | 1375 self.logger.debug('Trying server %r without ssl' % server) |
| 1375 server = imaplib.IMAP4(server) | 1376 server = imaplib.IMAP4(server) |
| 1376 except (imaplib.IMAP4.error, socket.error, socket.sslerror): | 1377 except (imaplib.IMAP4.error, socket.error, ssl_.SSLError): |
| 1377 self.logger.exception('IMAP server error') | 1378 self.logger.exception('IMAP server error') |
| 1378 return 1 | 1379 return 1 |
| 1379 | 1380 |
| 1380 try: | 1381 try: |
| 1381 if cram: | 1382 if cram: |
| 1413 self.handle_Message(message_from_bytes(s, RoundupMessage)) | 1414 self.handle_Message(message_from_bytes(s, RoundupMessage)) |
| 1414 server.close() | 1415 server.close() |
| 1415 finally: | 1416 finally: |
| 1416 try: | 1417 try: |
| 1417 server.expunge() | 1418 server.expunge() |
| 1418 except (imaplib.IMAP4.error, socket.error, socket.sslerror): | 1419 except (imaplib.IMAP4.error, socket.error, ssl_.SSLError): |
| 1419 pass | 1420 pass |
| 1420 server.logout() | 1421 server.logout() |
| 1421 | 1422 |
| 1422 return 0 | 1423 return 0 |
| 1423 | 1424 |
| 1459 if ssl: | 1460 if ssl: |
| 1460 klass = poplib.POP3_SSL | 1461 klass = poplib.POP3_SSL |
| 1461 else: | 1462 else: |
| 1462 klass = poplib.POP3 | 1463 klass = poplib.POP3 |
| 1463 server = klass(server) | 1464 server = klass(server) |
| 1464 except socket.error: | 1465 except (socket.error, ssl_.SSLError): |
| 1465 self.logger.exception('POP server error') | 1466 self.logger.exception('POP server error') |
| 1466 return 1 | 1467 return 1 |
| 1467 if apop: | 1468 if apop: |
| 1468 server.apop(user, password) | 1469 server.apop(user, password) |
| 1469 else: | 1470 else: |