Resolved conflicts for pulling from testing branch

1 files changed, 0 insertions, 80 deletions

diff --git a/wqflask/flask_security/recoverable.py b/wqflask/flask_security/recoverable.py
deleted file mode 100644
index 6aafc111..00000000
--- a/wqflask/flask_security/recoverable.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    flask.ext.security.recoverable
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    Flask-Security recoverable module
-
-    :copyright: (c) 2012 by Matt Wright.
-    :license: MIT, see LICENSE for more details.
-"""
-
-from flask import current_app as app, request
-from werkzeug.local import LocalProxy
-
-from .signals import password_reset, reset_password_instructions_sent
-from .utils import send_mail, md5, encrypt_password, url_for_security, \
-     get_token_status, config_value
-
-
-# Convenient references
-_security = LocalProxy(lambda: app.extensions['security'])
-
-_datastore = LocalProxy(lambda: _security.datastore)
-
-
-def send_reset_password_instructions(user):
-    """Sends the reset password instructions email for the specified user.
-
-    :param user: The user to send the instructions to
-    """
-    token = generate_reset_password_token(user)
-    url = url_for_security('reset_password', token=token)
-    reset_link = request.url_root[:-1] + url
-
-    send_mail(config_value('EMAIL_SUBJECT_PASSWORD_RESET'), user.email,
-              'reset_instructions',
-              user=user, reset_link=reset_link)
-
-    reset_password_instructions_sent.send(dict(user=user, token=token),
-                                          app=app._get_current_object())
-
-
-def send_password_reset_notice(user):
-    """Sends the password reset notice email for the specified user.
-
-    :param user: The user to send the notice to
-    """
-    send_mail(config_value('EMAIL_SUBJECT_PASSWORD_NOTICE'), user.email,
-              'reset_notice', user=user)
-
-
-def generate_reset_password_token(user):
-    """Generates a unique reset password token for the specified user.
-
-    :param user: The user to work with
-    """
-    data = [str(user.id), md5(user.password)]
-    return _security.reset_serializer.dumps(data)
-
-
-def reset_password_token_status(token):
-    """Returns the expired status, invalid status, and user of a password reset
-    token. For example::
-
-        expired, invalid, user = reset_password_token_status('...')
-
-    :param token: The password reset token
-    """
-    return get_token_status(token, 'reset', 'RESET_PASSWORD')
-
-def update_password(user, password):
-    """Update the specified user's password
-
-    :param user: The user to update_password
-    :param password: The unencrypted new password
-    """
-    user.password = encrypt_password(password)
-    _datastore.put(user)
-    send_password_reset_notice(user)
-    password_reset.send(user, app=app._get_current_object())