From 35d480bc482333e99f1785aca7259d7799dd4537 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Tue, 25 Oct 2016 21:36:47 -0500 Subject: [PATCH] Clean up bogus whitespace changes/inconsistency --- src/octoprint/server/util/flask.py | 2 +- src/octoprint/server/util/tornado.py | 4 ++-- src/octoprint/users.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py index d7aca094..a0292ad1 100644 --- a/src/octoprint/server/util/flask.py +++ b/src/octoprint/server/util/flask.py @@ -426,7 +426,7 @@ class OctoPrintFlaskResponse(flask.Response): def passive_login(): if octoprint.server.userManager.enabled: - user = octoprint.server.userManager.login_user(flask_login.current_user) + user = octoprint.server.userManager.login_user(flask_login.current_user) else: user = flask_login.current_user diff --git a/src/octoprint/server/util/tornado.py b/src/octoprint/server/util/tornado.py index 54eb0955..e599d151 100644 --- a/src/octoprint/server/util/tornado.py +++ b/src/octoprint/server/util/tornado.py @@ -672,8 +672,8 @@ class CustomHTTPServer(tornado.httpserver.HTTPServer): ``default_max_body_size`` is the default maximum body size to apply if no specific one from ``max_body_sizes`` matches. """ - def __init__(self, *args, **kwargs): - pass + def __init__(self, *args, **kwargs): + pass def initialize(self, request_callback, no_keep_alive=False, io_loop=None, xheaders=False, ssl_options=None, protocol=None, diff --git a/src/octoprint/users.py b/src/octoprint/users.py index 1ce377a0..d7d4d1e4 100644 --- a/src/octoprint/users.py +++ b/src/octoprint/users.py @@ -444,15 +444,15 @@ class User(UserMixin): def get_name(self): return self._username - @property + @property def is_active(self): return self._active - @property + @property def is_user(self): return "user" in self._roles - @property + @property def is_admin(self): return "admin" in self._roles