From ea53fd368a21da91425758d43d29cb1c85839136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 6 Jul 2015 17:03:36 +0200 Subject: [PATCH] settings().get(..) => settings().getBoolean(..) --- src/octoprint/server/util/__init__.py | 4 ++-- src/octoprint/server/util/flask.py | 2 +- src/octoprint/util/comm.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/octoprint/server/util/__init__.py b/src/octoprint/server/util/__init__.py index 426acc7a..047bff2c 100644 --- a/src/octoprint/server/util/__init__.py +++ b/src/octoprint/server/util/__init__.py @@ -44,7 +44,7 @@ def apiKeyRequestHandler(): # ui api key => continue regular request processing return - if not settings().get(["api", "enabled"]): + if not settings().getBoolean(["api", "enabled"]): # api disabled => 401 return _flask.make_response("API disabled", 401) @@ -104,7 +104,7 @@ def optionsAllowOrigin(request): def get_user_for_apikey(apikey): - if settings().get(["api", "enabled"]) and apikey is not None: + if settings().getBoolean(["api", "enabled"]) and apikey is not None: if apikey == settings().get(["api", "key"]) or octoprint.server.appSessionManager.validate(apikey): # master key or an app session key was used return ApiUser() diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py index 0f3d4a05..630f87a2 100644 --- a/src/octoprint/server/util/flask.py +++ b/src/octoprint/server/util/flask.py @@ -302,7 +302,7 @@ def _get_flask_user_from_request(request): from octoprint.settings import settings apikey = octoprint.server.util.get_api_key(request) - if settings().get(["api", "enabled"]) and apikey is not None: + if settings().getBoolean(["api", "enabled"]) and apikey is not None: user = octoprint.server.util.get_user_for_apikey(apikey) else: user = flask.ext.login.current_user diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index ddd6afc5..05f21ecb 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -246,7 +246,7 @@ class MachineCom(object): return if newState == self.STATE_CLOSED or newState == self.STATE_CLOSED_WITH_ERROR: - if settings().get(["feature", "sdSupport"]): + if settings().getBoolean(["feature", "sdSupport"]): self._sdFileList = False self._sdFiles = [] self._callback.on_comm_sd_files([]) @@ -407,7 +407,7 @@ class MachineCom(object): self._serial.close() self._serial = None - if settings().get(["feature", "sdSupport"]): + if settings().getBoolean(["feature", "sdSupport"]): self._sdFileList = [] if printing: