paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 03:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

send_email: Use CommandError for user-facing command line errors.

Browse Source 
This provides much nicer error output (not a traceback).
This commit is contained in:
Tim Abbott
2020-04-18 13:30:03 -07:00
parent 507f889901
commit e1849b63c1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/lib/send_email.py
View File

@@ -1,5 +1,6 @@
from django.conf import settings from django.conf import settings
from django.core.mail import EmailMultiAlternatives from django.core.mail import EmailMultiAlternatives
from django.core.management import CommandError
from django.template import loader from django.template import loader
from django.utils.timezone import now as timezone_now from django.utils.timezone import now as timezone_now
from django.utils.translation import override as override_language from django.utils.translation import override as override_language
@@ -130,13 +131,13 @@ def build_email(template_prefix: str, to_user_ids: Optional[List[int]]=None,
class EmailNotDeliveredException(Exception): class EmailNotDeliveredException(Exception):
pass pass
class DoubledEmailArgumentException(Exception): class DoubledEmailArgumentException(CommandError):
def __init__(self, argument_name: str) -> None: def __init__(self, argument_name: str) -> None:
msg = "Argument '%s' is ambiguously present in both options and email template." % ( msg = "Argument '%s' is ambiguously present in both options and email template." % (
argument_name) argument_name)
super().__init__(msg) super().__init__(msg)
class NoEmailArgumentException(Exception): class NoEmailArgumentException(CommandError):
def __init__(self, argument_name: str) -> None: def __init__(self, argument_name: str) -> None:
msg = "Argument '%s' is required in either options or email template." % ( msg = "Argument '%s' is required in either options or email template." % (
argument_name) argument_name)