From bb1f79de75fa48026295367fad42d97dd1010326 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Mon, 9 Mar 2020 20:29:05 +0100 Subject: [PATCH] json bug --- networking/Networking.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/networking/Networking.py b/networking/Networking.py index 3f783d0..842b13d 100644 --- a/networking/Networking.py +++ b/networking/Networking.py @@ -1,5 +1,6 @@ import requests_unixsocket as req import socket +import json import asyncio from utils.Singleton import Singleton @@ -19,16 +20,16 @@ class Networking(metaclass=Singleton): return response def getSolenoids(self): - return self.get("/solenoids").json() + return json.loads(self.get("/solenoids")) def getSounds(self): - return self.get("/sounds").json() + return json.loads(self.get("/sounds")) def getLamps(self): - return self.get("/lamps").json() + return json.loads(self.get("/lamps")) def getDisplays(self): - return self.get("/displays").json() + return json.loads(self.get("/displays")) def triggerSolenoid(self, solenoid): self.get("/solenoids/" + solenoid + "/trigger") @@ -43,7 +44,7 @@ class Networking(metaclass=Singleton): self.get("/lamps/" + lamp + "/deactivate") def lampStatus(self, lamp): - return self.get("/lamps/" + lamp + "/status").json() + return json.loads(self.get("/lamps/" + lamp + "/status")) def writeDisplayScore(self, display, score): self.get("/displays/" + display + "/write_score/" + str(score))