Skip to content

Commit ccc6947

Browse files
committed
Renamed send_async_email to send_email
1 parent fed5e82 commit ccc6947

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

app/account/views.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from flask.ext.rq import get_queue
99
from . import account
1010
from .. import db
11-
from ..email import send_async_email
11+
from ..email import send_email
1212
from ..models import User
1313
from .forms import (
1414
LoginForm,
@@ -51,7 +51,7 @@ def register():
5151
token = user.generate_confirmation_token()
5252
confirm_link = url_for('account.confirm', token=token, _external=True)
5353
get_queue().enqueue(
54-
send_async_email,
54+
send_email,
5555
recipient=user.email,
5656
subject='Confirm Your Account',
5757
template='account/email/confirm',
@@ -93,7 +93,7 @@ def reset_password_request():
9393
reset_link = url_for('account.reset_password', token=token,
9494
_external=True)
9595
get_queue().enqueue(
96-
send_async_email,
96+
send_email,
9797
recipient=user.email,
9898
subject='Reset Your Password',
9999
template='account/email/reset_password',
@@ -158,7 +158,7 @@ def change_email_request():
158158
change_email_link = url_for('account.change_email', token=token,
159159
_external=True)
160160
get_queue().enqueue(
161-
send_async_email,
161+
send_email,
162162
recipient=new_email,
163163
subject='Confirm Your New Email',
164164
template='account/email/change_email',
@@ -193,7 +193,7 @@ def confirm_request():
193193
token = current_user.generate_confirmation_token()
194194
confirm_link = url_for('account.confirm', token=token, _external=True)
195195
get_queue().enqueue(
196-
send_async_email,
196+
send_email,
197197
recipient=current_user.email,
198198
subject='Confirm Your Account',
199199
template='account/email/confirm',
@@ -257,7 +257,7 @@ def join_from_invite(user_id, token):
257257
invite_link = url_for('account.join_from_invite', user_id=user_id,
258258
token=token, _external=True)
259259
get_queue().enqueue(
260-
send_async_email,
260+
send_email,
261261
recipient=new_user.email,
262262
subject='You Are Invited To Join',
263263
template='account/email/invite',

app/admin/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from . import admin
1414
from ..models import User, Role
1515
from .. import db
16-
from ..email import send_async_email
16+
from ..email import send_email
1717

1818

1919
@admin.route('/')
@@ -60,7 +60,7 @@ def invite_user():
6060
invite_link = url_for('account.join_from_invite', user_id=user.id,
6161
token=token, _external=True)
6262
get_queue().enqueue(
63-
send_async_email,
63+
send_email,
6464
recipient=user.email,
6565
subject='You Are Invited To Join',
6666
template='account/email/invite',

app/email.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from app import create_app
66

77

8-
def send_async_email(recipient, subject, template, **kwargs):
8+
def send_email(recipient, subject, template, **kwargs):
99
app = create_app(os.getenv('FLASK_CONFIG') or 'default')
1010
with app.app_context():
1111
msg = Message(app.config['EMAIL_SUBJECT_PREFIX'] + ' ' + subject,

0 commit comments

Comments
 (0)