Renamed _flask_user_base.html to base.html

MANIFEST.in

@@ -1,2 +1,2 @@
-include AUTHORS.txt CHANGES.txt LICENSE.txt README.md
+include AUTHORS.txt CHANGES.txt LICENSE.txt README.rst
 recursive-include flask_user *

docs/source/index.rst

@@ -6,8 +6,8 @@ Flask-User
 .. image:: https://travis-ci.org/lingthio/flask-user.png?branch=master
     :target: https://travis-ci.org/lingthio/flask-user
 
-.. image:: https://coveralls.io/repos/lingthio/flask-user/badge.png?branch=master
-    :target: https://coveralls.io/r/lingthio/flask-user?branch=master
+.. comment .. image:: https://coveralls.io/repos/lingthio/flask-user/badge.png?branch=master
+.. comment    :target: https://coveralls.io/r/lingthio/flask-user?branch=master
 
 .. image:: https://pypip.in/d/Flask-User/badge.png
     :target: https://pypi.python.org/pypi/Flask-User
@@ -23,7 +23,7 @@ Flask-User
     - signals.confirmation_email_set                   --> user_registered
     - template variable {{ confirmation_link }}        --> {{ confirm_email_link }}
     - templates/flask_user/emails/reset_password_*     --> forgot_password_*
-    - signals.reset_password_email_sent                --> forgot_password_email_sent
+    - signals.reset_password_email_sent                --> user_forgot_password
 
 Customizable User Account Management for Flask
 ----------------------------------------------

example_apps/roles_required_app.py

@@ -2,7 +2,7 @@
 from flask.ext.babel import Babel
 from flask.ext.mail import Mail
 from flask.ext.sqlalchemy import SQLAlchemy
-from flask.ext.user import login_required, SQLAlchemyAdapter, UserManager, UserMixin
+from flask.ext.user import current_user, login_required, SQLAlchemyAdapter, UserManager, UserMixin
 from flask.ext.user import roles_required
 
 # Use a Class-based config to avoid needing a 2nd file
@@ -95,8 +95,8 @@ class User(db.Model, UserMixin):
     # The '/' page is accessible to anyone
     @app.route('/')
     def home_page():
-        # if current_user.is_authenticated():
-        #     return profile_page()
+        if current_user.is_authenticated():
+            return profile_page()
         return render_template_string("""
             {% extends "base.html" %}
             {% block content %}

flask_user/__init__.py

@@ -44,7 +44,7 @@ def _flask_user_context_processor():
     return dict(user_manager=current_app.user_manager)
 
 
-class UserManager():
+class UserManager(object):
     """
     This is the Flask-User object that manages the User management process.
     """
@@ -116,12 +116,13 @@ def init_app(self, app):
         """
         Initialize app.user_manager.
         """
+        # Bind Flask-USER to app
         app.user_manager = self
 
-        # Set default app.config settings, but only if they have not been set before
+        # Set defaults for undefined settings
         settings.set_default_settings(self, app.config)
 
-        # Verify config combinations. Produce a helpful error messages for invalid combinations.
+        # Make sure the settings are valid -- raise ConfigurationError if not
         settings.check_settings(self)
 
         # Initialize Translations -- Only if Flask-Babel has been installed

flask_user/templates/flask_user/change_password.html

@@ -1,4 +1,4 @@
-{% extends "flask_user/_flask_user_base.html" %}
+{% extends "flask_user/base.html" %}
 
 {% block content %}
 {% from "flask_user/_macros.html" import render_field, render_submit_field %}

flask_user/templates/flask_user/change_username.html

@@ -1,4 +1,4 @@
-{% extends "flask_user/_flask_user_base.html" %}
+{% extends "flask_user/base.html" %}
 
 {% block content %}
 {% from "flask_user/_macros.html" import render_field, render_submit_field %}

flask_user/templates/flask_user/forgot_password.html

@@ -1,4 +1,4 @@
-{% extends "flask_user/_flask_user_base.html" %}
+{% extends "flask_user/base.html" %}
 
 {% block content %}
 {% from "flask_user/_macros.html" import render_field, render_submit_field %}

flask_user/templates/flask_user/login.html

@@ -1,4 +1,4 @@
-{% extends "flask_user/_flask_user_base.html" %}
+{% extends "flask_user/base.html" %}
 
 {% block content %}
 {% from "flask_user/_macros.html" import render_field, render_submit_field %}

flask_user/templates/flask_user/register.html

@@ -1,4 +1,4 @@
-{% extends "flask_user/_flask_user_base.html" %}
+{% extends "flask_user/base.html" %}
 
 {% block content %}
 {% from "flask_user/_macros.html" import render_field, render_submit_field %}

flask_user/templates/flask_user/resend_confirm_email.html

@@ -1,4 +1,4 @@
-{% extends "flask_user/_flask_user_base.html" %}
+{% extends "flask_user/base.html" %}
 
 {% block content %}
 {% from "flask_user/_macros.html" import render_field, render_submit_field %}

flask_user/templates/flask_user/reset_password.html

@@ -1,4 +1,4 @@
-{% extends "flask_user/_flask_user_base.html" %}
+{% extends "flask_user/base.html" %}
 
 {% block content %}
 {% from "flask_user/_macros.html" import render_field, render_submit_field %}

flask_user/tests/tstutils.py

@@ -28,7 +28,7 @@ def response_has_no_errors(response):
         print(response.data)
     return not has_errors
 
-class TstClient():
+class TstClient(object):
     """
     Utility class for tests
     """

flask_user/tokens.py

@@ -15,7 +15,7 @@
 from Crypto.Cipher import AES
 from itsdangerous import BadSignature, SignatureExpired, TimestampSigner
 
-class TokenManager():
+class TokenManager(object):
     def setup(self, secret):
         """
         Create a cypher to encrypt IDs and a signer to sign tokens.