aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/auth/lib.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-11-13 20:23:26 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-11-13 20:23:26 -0600
commitee91c2b88d1a42b9d15d34d2c081cd8394649041 (patch)
tree01a75b958b2814763a0b219145bbe284d1d04931 /mediagoblin/auth/lib.py
parent4671fda345394dad9ca4278b1cf7b2cdf7d2b4ee (diff)
parent285ffeddf3542201b83072d3be544c85e9c487c2 (diff)
downloadmediagoblin-ee91c2b88d1a42b9d15d34d2c081cd8394649041.tar.lz
mediagoblin-ee91c2b88d1a42b9d15d34d2c081cd8394649041.tar.xz
mediagoblin-ee91c2b88d1a42b9d15d34d2c081cd8394649041.zip
Merge remote-tracking branch 'remotes/nyergler/pep8-ification'
Conflicts: mediagoblin/db/migrations.py mediagoblin/db/models.py mediagoblin/user_pages/views.py mediagoblin/util.py
Diffstat (limited to 'mediagoblin/auth/lib.py')
-rw-r--r--mediagoblin/auth/lib.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/auth/lib.py b/mediagoblin/auth/lib.py
index 4c57ef88..653424cc 100644
--- a/mediagoblin/auth/lib.py
+++ b/mediagoblin/auth/lib.py
@@ -94,6 +94,7 @@ EMAIL_VERIFICATION_TEMPLATE = (
u"http://{host}{uri}?"
u"userid={userid}&token={verification_key}")
+
def send_verification_email(user, request):
"""
Send the verification email to users to activate their accounts.
@@ -128,6 +129,7 @@ EMAIL_FP_VERIFICATION_TEMPLATE = (
u"http://{host}{uri}?"
u"userid={userid}&token={fp_verification_key}")
+
def send_fp_verification_email(user, request):
"""
Send the verification email to users to change their password.
@@ -151,4 +153,3 @@ def send_fp_verification_email(user, request):
[user['email']],
'GNU MediaGoblin - Change forgotten password!',
rendered_email)
-