diff --git a/channels/raiplay.py b/channels/raiplay.py index a573ec34..d685da92 100644 --- a/channels/raiplay.py +++ b/channels/raiplay.py @@ -7,9 +7,9 @@ import requests from core import support import sys if sys.version_info[0] >= 3: - from lib.concurrent import futures + from concurrent import futures else: - from lib.concurrent_py2 import futures + from concurrent_py2 import futures current_session = requests.Session() host = support.config.get_channel_url() onair = host + '/palinsesto/onAir.json' diff --git a/channels/seriehd.py b/channels/seriehd.py index 9dca0168..4ce77527 100644 --- a/channels/seriehd.py +++ b/channels/seriehd.py @@ -103,9 +103,9 @@ def episodios(item): data = '' import sys if sys.version_info[0] >= 3: - from lib.concurrent import futures + from concurrent import futures else: - from lib.concurrent_py2 import futures + from concurrent_py2 import futures with futures.ThreadPoolExecutor() as executor: thL = [] for i, season in enumerate(seasons.matches): diff --git a/channels/vvvvid.py b/channels/vvvvid.py index 8f2047b2..6ccf38b2 100644 --- a/channels/vvvvid.py +++ b/channels/vvvvid.py @@ -8,9 +8,9 @@ from core.item import Item from specials import autorenumber import sys if sys.version_info[0] >= 3: - from lib.concurrent import futures + from concurrent import futures else: - from lib.concurrent_py2 import futures + from concurrent_py2 import futures host = support.config.get_channel_url() diff --git a/core/servertools.py b/core/servertools.py index 981a8e5a..666594a7 100644 --- a/core/servertools.py +++ b/core/servertools.py @@ -738,9 +738,9 @@ def check_list_links(itemlist, numero='', timeout=3): numero = ((int(numero) + 1) * 5) if numero != '' else 10 import sys if sys.version_info[0] >= 3: - from lib.concurrent import futures + from concurrent import futures else: - from lib.concurrent_py2 import futures + from concurrent_py2 import futures with futures.ThreadPoolExecutor() as executor: checked = [] for it in itemlist: diff --git a/core/support.py b/core/support.py index e9ef85c1..60eeb4d8 100755 --- a/core/support.py +++ b/core/support.py @@ -7,9 +7,9 @@ import os import re import sys if sys.version_info[0] >= 3: - from lib.concurrent import futures + from concurrent import futures else: - from lib.concurrent_py2 import futures + from concurrent_py2 import futures try: import urllib.request as urllib diff --git a/default.py b/default.py index b0285886..34c7681a 100644 --- a/default.py +++ b/default.py @@ -12,7 +12,7 @@ from platformcode import config, logger logger.info("init...") librerias = xbmc.translatePath(os.path.join(config.get_runtime_path(), 'lib')) -sys.path.insert(0, librerias) +sys.path.append(librerias) if not config.dev_mode(): from platformcode import updater diff --git a/lib/unshortenit.py b/lib/unshortenit.py index 4427ba47..fcd794ec 100644 --- a/lib/unshortenit.py +++ b/lib/unshortenit.py @@ -593,9 +593,9 @@ def findlinks(text): # text += '\n' + sh import sys if sys.version_info[0] >= 3: - from lib.concurrent import futures + from concurrent import futures else: - from lib.concurrent_py2 import futures + from concurrent_py2 import futures with futures.ThreadPoolExecutor() as executor: unshList = [executor.submit(unshorten, match) for match in matches] for link in futures.as_completed(unshList): diff --git a/specials/community.py b/specials/community.py index f7320e0b..3b429b3f 100644 --- a/specials/community.py +++ b/specials/community.py @@ -449,9 +449,9 @@ def get_search_menu(item, json='', itemlist=[], channel_name=''): def submenu(item, json, key, itemlist = []): import sys if sys.version_info[0] >= 3: - from lib.concurrent import futures + from concurrent import futures else: - from lib.concurrent_py2 import futures + from concurrent_py2 import futures filter_list = [] for option in json[key]: diff --git a/specials/nextep.py b/specials/nextep.py index b4d2fd49..90425d66 100644 --- a/specials/nextep.py +++ b/specials/nextep.py @@ -6,9 +6,9 @@ from core import scrapertools from core import jsontools, filetools import sys if sys.version_info[0] >= 3: - from lib.concurrent import futures + from concurrent import futures else: - from lib.concurrent_py2 import futures + from concurrent_py2 import futures next_dialogs = ['NextDialog.xml', 'NextDialogExtended.xml', 'NextDialogCompact.xml'] next_ep_type = config.get_setting('next_ep_type') diff --git a/specials/search.py b/specials/search.py index 1756f419..8c14b345 100644 --- a/specials/search.py +++ b/specials/search.py @@ -14,9 +14,9 @@ if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int import os, json, time, inspect, channelselector if PY3: - from lib.concurrent import futures + from concurrent import futures else: - from lib.concurrent_py2 import futures + from concurrent_py2 import futures from core.item import Item from core import tmdb, scrapertools, channeltools, filetools, jsontools from channelselector import get_thumb