From 5afda1ff50cf552fb6b98885460c704d04b47e3e Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Tue, 29 Sep 2020 19:57:53 +0200 Subject: [PATCH] Ultimi fix --- channels/animeunity.py | 3 ++- channels/vvvvid.py | 9 ++------- core/tvdb.py | 8 +++++++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/channels/animeunity.py b/channels/animeunity.py index e9e70610..064d834d 100644 --- a/channels/animeunity.py +++ b/channels/animeunity.py @@ -4,7 +4,8 @@ # ------------------------------------------------------------ import requests, json, copy -from core import support, autorenumber +from core import support +from platformcode import autorenumber try: from lib import cloudscraper except: from lib import cloudscraper diff --git a/channels/vvvvid.py b/channels/vvvvid.py index b227e2fa..bdfffca2 100644 --- a/channels/vvvvid.py +++ b/channels/vvvvid.py @@ -3,13 +3,8 @@ # Canale per vvvvid # ---------------------------------------------------------- import requests, sys -from core import support, tmdb, autorenumber - -if sys.version_info[0] >= 3: - pass -else: - pass - +from core import support, tmdb +from platformcode import autorenumber host = support.config.get_channel_url() diff --git a/core/tvdb.py b/core/tvdb.py index bd15e45d..674125a8 100644 --- a/core/tvdb.py +++ b/core/tvdb.py @@ -6,6 +6,10 @@ # Used to obtain series data for the video library # ------------------------------------------------------------ +import sys +if sys.version_info[0] >= 3: PY3 = True +else: PY3 = False + from future import standard_library standard_library.install_aliases() from future.builtins import object @@ -390,9 +394,11 @@ class Tvdb(object): url = HOST + "/login" params = {"apikey": apikey} + if PY3: params = jsontools.dump(params).encode() + else: params = jsontools.dump(params) try: - req = urllib.request.Request(url, data=jsontools.dump(params), headers=DEFAULT_HEADERS) + req = urllib.request.Request(url, data=params, headers=DEFAULT_HEADERS) response = urllib.request.urlopen(req) html = response.read() response.close()