Resolved conflicts for pulling from testing branch

1 files changed, 0 insertions, 59 deletions

diff --git a/wqflask/flask_security/passwordless.py b/wqflask/flask_security/passwordless.py
deleted file mode 100644
index b0accb2c..00000000
--- a/wqflask/flask_security/passwordless.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    flask.ext.security.passwordless
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    Flask-Security passwordless module
-
-    :copyright: (c) 2012 by Matt Wright.
-    :license: MIT, see LICENSE for more details.
-"""
-
-from flask import request, current_app as app
-from werkzeug.local import LocalProxy
-
-from .signals import login_instructions_sent
-from .utils import send_mail, url_for_security, get_token_status, \
-     config_value
-
-
-# Convenient references
-_security = LocalProxy(lambda: app.extensions['security'])
-
-_datastore = LocalProxy(lambda: _security.datastore)
-
-
-def send_login_instructions(user):
-    """Sends the login instructions email for the specified user.
-
-    :param user: The user to send the instructions to
-    :param token: The login token
-    """
-    token = generate_login_token(user)
-    url = url_for_security('token_login', token=token)
-    login_link = request.url_root[:-1] + url
-
-    send_mail(config_value('EMAIL_SUBJECT_PASSWORDLESS'), user.email,
-              'login_instructions', user=user, login_link=login_link)
-
-    login_instructions_sent.send(dict(user=user, login_token=token),
-                                 app=app._get_current_object())
-
-
-def generate_login_token(user):
-    """Generates a unique login token for the specified user.
-
-    :param user: The user the token belongs to
-    """
-    return _security.login_serializer.dumps([str(user.id)])
-
-
-def login_token_status(token):
-    """Returns the expired status, invalid status, and user of a login token.
-    For example::
-
-        expired, invalid, user = login_token_status('...')
-
-    :param token: The login token
-    """
-    return get_token_status(token, 'login', 'LOGIN')