From b9d467d23f94c21bd7dcb551368554b339cfba26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Sun, 14 Apr 2013 15:33:11 +0200 Subject: [PATCH] Upgraded to most recent Flask-Principal version, since an attribute name was changed there which OctoPrint uses --- octoprint/server.py | 2 +- octoprint/users.py | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/octoprint/server.py b/octoprint/server.py index 777aec2..a89b659 100644 --- a/octoprint/server.py +++ b/octoprint/server.py @@ -610,7 +610,7 @@ def logout(): @identity_loaded.connect_via(app) def on_identity_loaded(sender, identity): - user = load_user(identity.name) + user = load_user(identity.id) if user is None: return diff --git a/octoprint/users.py b/octoprint/users.py index 01ef167..d7cb453 100644 --- a/octoprint/users.py +++ b/octoprint/users.py @@ -232,4 +232,4 @@ class DummyIdentity(Identity): Identity.__init__(self, "dummy") def dummy_identity_loader(): - return DummyIdentity() \ No newline at end of file + return DummyIdentity() diff --git a/requirements.txt b/requirements.txt index e1a1510..2f87569 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ tornado>=2.4.1 tornadio2>=0.0.4 PyYAML>=3.10 Flask-Login>=0.1.3 -Flask-Principal>=0.3.4 \ No newline at end of file +Flask-Principal>=0.3.5 \ No newline at end of file