From 84c2551f0c429407af1f713ba07174902df85b71 Mon Sep 17 00:00:00 2001 From: EKbfh Date: Tue, 20 Sep 2022 11:23:25 +0300 Subject: [PATCH] Remove decode() --- tower/api/base.py | 2 +- tower/models/environment.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tower/api/base.py b/tower/api/base.py index ac60525c..2e7a0a08 100644 --- a/tower/api/base.py +++ b/tower/api/base.py @@ -29,7 +29,7 @@ class BaseHandler(tornado.web.RequestHandler): # Fallback to basic auth_header = self.request.headers.get("Authorization") if auth_header and auth_header.startswith("Basic "): - auth = codecs.decode(auth_header[6:].encode("utf-8"), "base64").decode("utf-8") + auth = codecs.decode(auth_header[6:].encode("utf-8"), "base64") u, p = auth.split(":", 2) au = User.authenticate(u, p) if au.is_active: diff --git a/tower/models/environment.py b/tower/models/environment.py index 4dfedf95..424aa373 100644 --- a/tower/models/environment.py +++ b/tower/models/environment.py @@ -294,8 +294,8 @@ class Environment(Model): for n in need_cert: conf = json.loads(n.config) - conf["cert"] = str(certificate[s]["cert"].decode()) - conf["cert_key"] = str(certificate[s]["key"].decode()) + conf["cert"] = str(certificate[s]["cert"]) + conf["cert_key"] = str(certificate[s]["key"]) n.config = json.dumps(conf, sort_keys=True) n.save() -- GitLab