Mercurial > p > roundup > code
diff roundup/mailgw.py @ 5248:198b6e810c67
Use Python-3-compatible 'as' syntax for except statements
Many raise statements near these are also fixed.
So are two ivorrect file encoding marks ('utf8'->'utf-8').
| author | Eric S. Raymond <esr@thyrsus.com> |
|---|---|
| date | Thu, 24 Aug 2017 22:21:37 -0400 |
| parents | 86190260f077 |
| children | 32f95ec6bd8e |
line wrap: on
line diff
--- a/roundup/mailgw.py Thu Aug 24 17:55:02 2017 -0400 +++ b/roundup/mailgw.py Thu Aug 24 22:21:37 2017 -0400 @@ -192,17 +192,17 @@ # try to narrow down the actual problem to give a more useful # message in our bounce if sig.summary & pyme.constants.sigsum.KEY_MISSING: - raise MailUsageError, \ - _("Message signed with unknown key: %s") % sig.fpr + raise MailUsageError( \ + _("Message signed with unknown key: %s") % sig.fpr) elif sig.summary & pyme.constants.sigsum.KEY_EXPIRED: - raise MailUsageError, \ - _("Message signed with an expired key: %s") % sig.fpr + raise MailUsageError( \ + _("Message signed with an expired key: %s") % sig.fpr) elif sig.summary & pyme.constants.sigsum.KEY_REVOKED: - raise MailUsageError, \ - _("Message signed with a revoked key: %s") % sig.fpr + raise MailUsageError( \ + _("Message signed with a revoked key: %s") % sig.fpr) else: - raise MailUsageError, \ - _("Invalid PGP signature detected.") + raise MailUsageError( \ + _("Invalid PGP signature detected.")) # we couldn't find a key belonging to the author of the email if sigs: @@ -1152,11 +1152,11 @@ recipients=self.recipients, date=date.Date('.'), summary=summary, content=content, messageid=messageid, inreplyto=inreplyto, **self.msg_props) - except exceptions.Reject, error: - raise MailUsageError, _(""" + except exceptions.Reject as error: + raise MailUsageError(_(""" Mail message was rejected by a detector. %(error)s -""") % locals() +""") % locals()) # allowed to attach the message to the existing node? if self.nodeid and not self.db.security.hasPermission('Edit', self.author, self.classname, 'messages'): @@ -1196,7 +1196,7 @@ 'property %(prop)s of class %(classname)s.' ) % locals() self.nodeid = self.cl.create(**self.props) - except (TypeError, IndexError, ValueError, exceptions.Reject), message: + except (TypeError, IndexError, ValueError, exceptions.Reject) as message: self.mailgw.logger.exception("Rejecting email due to node creation error:") raise MailUsageError, _(""" There was a problem with the message you sent: @@ -1373,7 +1373,7 @@ server.login_cram_md5(user, password) else: server.login(user, password) - except imaplib.IMAP4.error, e: + except imaplib.IMAP4.error as e: self.logger.exception('IMAP login failure') return 1 @@ -1388,7 +1388,7 @@ return 1 try: numMessages = int(data[0]) - except ValueError, value: + except ValueError as value: self.logger.error('Invalid message count from mailbox %r'% data[0]) return 1 @@ -1526,7 +1526,7 @@ m.append(fulldoc) self.mailer.bounce_message(message, [sendto[0][1]], m, subject="Mail Gateway Help") - except MailUsageError, value: + except MailUsageError as value: # bounce the message back to the sender with the usage message self.logger.debug("MailUsageError raised, bouncing.") fulldoc = '\n'.join(string.split(__doc__, '\n')[2:]) @@ -1538,7 +1538,7 @@ message = self.parsed_message.message crypt = self.parsed_message.crypt self.mailer.bounce_message(message, [sendto[0][1]], m, crypt=crypt) - except Unauthorized, value: + except Unauthorized as value: # just inform the user that he is not authorized self.logger.debug("Unauthorized raised, bouncing.") m = [''] @@ -1688,7 +1688,7 @@ # extract the property name and value try: propname, value = prop.split('=') - except ValueError, message: + except ValueError as message: errors.append(_('not of form [arg=value,value,...;' 'arg=value,value,...]')) return (errors, props) @@ -1697,7 +1697,7 @@ try: props[propname] = hyperdb.rawToHyperdb(self.db, cl, nodeid, propname, value) - except hyperdb.HyperdbValueError, message: + except hyperdb.HyperdbValueError as message: errors.append(str(message)) return errors, props
