From bc3fa3fc26eda71380f113b82aa2aa2c2bedc405 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Sun, 6 Dec 2020 09:36:19 -0500 Subject: [PATCH] test --- fHDHR/origin/origin_channels.py | 3 +-- fHDHR/origin/origin_service.py | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/fHDHR/origin/origin_channels.py b/fHDHR/origin/origin_channels.py index c01b3a4..b4019e4 100644 --- a/fHDHR/origin/origin_channels.py +++ b/fHDHR/origin/origin_channels.py @@ -1,5 +1,4 @@ import m3u8 -import json class OriginChannels(): @@ -16,7 +15,7 @@ class OriginChannels(): channel_json_path = 'channels/list/%s.json?sort=hybrid&geoId=%s' % (self.origin.geoLST, self.origin.geoID) channel_json_url = self.base_api + channel_json_path - api_json = json.loads(self.fhdhr.web.session.get(channel_json_url).text) + api_json = self.fhdhr.web.session.get(channel_json_url).text print(api_json) return diff --git a/fHDHR/origin/origin_service.py b/fHDHR/origin/origin_service.py index afa7ffd..e0419c1 100644 --- a/fHDHR/origin/origin_service.py +++ b/fHDHR/origin/origin_service.py @@ -28,9 +28,6 @@ class OriginService(): def getID(self): - print(self.fhdhr.config.dict["origin"]["geoid"]) - print(self.fhdhr.config.dict["origin"]["geolst"]) - if self.fhdhr.config.dict["origin"]["geoID"] and self.fhdhr.config.dict["origin"]["geoLST"]: geoID = self.fhdhr.config.dict["origin"]["geoid"] geoLST = self.fhdhr.config.dict["origin"]["geolst"]