Skip to content

Commit

Permalink
Merge pull request #419 from metabrainz/use-brainzutils
Browse files Browse the repository at this point in the history
Use brainzutils, not the internal mail.py
  • Loading branch information
mayhem committed Jul 11, 2023
2 parents f7fc1cd + 5b58cdd commit 871786e
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 64 deletions.
2 changes: 1 addition & 1 deletion metabrainz/invoices/send_invoices.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from quickbooks import exceptions

from brainzutils import cache
from metabrainz.mail import send_mail
from brainzutils.mail import send_mail

SEND_DELAY = 5
MAIL_BODY = """To: %s %s (%s)
Expand Down
59 changes: 0 additions & 59 deletions metabrainz/mail.py

This file was deleted.

2 changes: 1 addition & 1 deletion metabrainz/model/access_log.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from metabrainz.model import db
from metabrainz.model.token import Token
from metabrainz.model.supporter import Supporter
from metabrainz.mail import send_mail
from brainzutils.mail import send_mail
from brainzutils import cache
from sqlalchemy import func, text
from sqlalchemy.dialects import postgresql
Expand Down
2 changes: 1 addition & 1 deletion metabrainz/model/supporter.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from metabrainz.model import db
from metabrainz.mail import send_mail
from brainzutils.mail import send_mail
from metabrainz.model.token import Token
from metabrainz.admin import AdminModelView
from sqlalchemy.sql.expression import func, or_
Expand Down
2 changes: 1 addition & 1 deletion metabrainz/payments/receipts.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from reportlab.lib.styles import ParagraphStyle
from reportlab.platypus import Paragraph
from reportlab.lib.enums import TA_LEFT, TA_RIGHT, TA_CENTER
from metabrainz.mail import send_mail
from brainzutils.mail import send_mail
from flask import current_app
import tempfile

Expand Down
2 changes: 1 addition & 1 deletion metabrainz/supporter/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from werkzeug.exceptions import NotFound, InternalServerError, BadRequest

from metabrainz import flash, session
from metabrainz.mail import send_mail, MailException
from brainzutils.mail import send_mail, MailException
from metabrainz.model import Dataset
from metabrainz.model.supporter import Supporter, InactiveSupporterException
from metabrainz.model.tier import Tier
Expand Down

0 comments on commit 871786e

Please sign in to comment.