Merge remote-tracking branch 'upstream/master' into change_email

Conflicts:
	mediagoblin/auth/lib.py

1 files changed, 0 insertions, 40 deletions

diff --git a/mediagoblin/auth/lib.py b/mediagoblin/auth/lib.py
index 8bba8484..bfc36b28 100644
--- a/mediagoblin/auth/lib.py
+++ b/mediagoblin/auth/lib.py
@@ -90,46 +90,6 @@ def fake_login_attempt():
     randplus_stored_hash == randplus_hashed_pass
 
 
-EMAIL_VERIFICATION_TEMPLATE = (
-    u"http://{host}{uri}?"
-    u"userid={userid}&token={verification_key}")
-
-
-def send_verification_email(user, request, email=None,
-                            rendered_email=None):
-    """
-    Send the verification email to users to activate their accounts.
-
-    Args:
-    - user: a user object
-    - request: the request
-    """
-    if not email:
-        email = user.email
-
-    if not rendered_email:
-        rendered_email = render_template(
-            request, 'mediagoblin/auth/verification_email.txt',
-            {'username': user.username,
-            'verification_url': EMAIL_VERIFICATION_TEMPLATE.format(
-                    host=request.host,
-                    uri=request.urlgen('mediagoblin.auth.verify_email'),
-                    userid=unicode(user.id),
-                    verification_key=user.verification_key)})
-
-    # TODO: There is no error handling in place
-    send_email(
-        mg_globals.app_config['email_sender_address'],
-        [email],
-        # TODO
-        # Due to the distributed nature of GNU MediaGoblin, we should
-        # find a way to send some additional information about the
-        # specific GNU MediaGoblin instance in the subject line. For
-        # example "GNU MediaGoblin @ Wandborg - [...]".
-        'GNU MediaGoblin - Verify your email!',
-        rendered_email)
-
-
 EMAIL_FP_VERIFICATION_TEMPLATE = (
     u"http://{host}{uri}?"
     u"userid={userid}&token={fp_verification_key}")