Author: adc
Date: Fri Jul 4 22:01:10 2014
New Revision: 1607951
URL: http://svn.apache.org/r1607951
Log:
More cleanup
Modified:
labs/panopticon/pan-site/src/asf/panopticon/__init__.py
Modified: labs/panopticon/pan-site/src/asf/panopticon/__init__.py
URL:
http://svn.apache.org/viewvc/labs/panopticon/pan-site/src/asf/panopticon/__init__.py?rev=1607951&r1=1607950&r2=1607951&view=diff
==============================================================================
--- labs/panopticon/pan-site/src/asf/panopticon/__init__.py (original)
+++ labs/panopticon/pan-site/src/asf/panopticon/__init__.py Fri Jul 4 22:01:10
2014
@@ -19,7 +19,6 @@
from logging import getLogger
import flask
-from flask.ext.principal import identity_changed, Identity, Principal,
identity_loaded
from flask.ext import principal
from asf.data import ldap
@@ -66,7 +65,7 @@ def login():
username = flask.request.form.get('username')
password = flask.request.form.get('password')
if ldap.check_user_password(username, password):
- identity_changed.send(app, identity=Identity(username))
+ principal.identity_changed.send(app,
identity=principal.Identity(username))
flask.flash(u'Signed in as ' + username, 'success')
else:
flask.flash(u'Invalid username or password', 'danger')
@@ -75,7 +74,7 @@ def login():
@app.route('/logout')
def logout():
- identity_changed.send(app, identity=None)
+ principal.identity_changed.send(app, identity=None)
flask.flash(u'You have been signed out', 'success')
return flask.redirect(flask.request.referrer)
@@ -88,8 +87,8 @@ login_required = is_authenticated.requir
def session_identity_loader():
if 'identity.id' in flask.session and 'identity.auth_type' in
flask.session:
- identity = Identity(flask.session['identity.id'],
- flask.session['identity.auth_type'])
+ identity = principal.Identity(flask.session['identity.id'],
+ flask.session['identity.auth_type'])
return identity
else:
return principal.AnonymousIdentity()
@@ -105,12 +104,12 @@ def session_identity_saver(identity):
flask.session.modified = True
-principals = Principal(app, use_sessions=False)
+principals = principal.Principal(app, use_sessions=False)
principals.identity_loader(session_identity_loader)
principals.identity_saver(session_identity_saver)
-@identity_loaded.connect
+@principal.identity_loaded.connect
def on_identity_loaded(sender, identity):
if identity is None:
return
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@labs.apache.org
For additional commands, e-mail: commits-h...@labs.apache.org
