diff --git a/channels/raiplay.py b/channels/raiplay.py index 8510d36a..a573ec34 100644 --- a/channels/raiplay.py +++ b/channels/raiplay.py @@ -5,7 +5,11 @@ import requests from core import support -from lib.concurrent import futures +import sys +if sys.version_info[0] >= 3: + from lib.concurrent import futures +else: + from lib.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 423c29d8..9dca0168 100644 --- a/channels/seriehd.py +++ b/channels/seriehd.py @@ -101,7 +101,11 @@ def episodios(item): seasons = support.match(url, patronBlock=patron_season, patron=patron_option) data = '' - from concurrent import futures + import sys + if sys.version_info[0] >= 3: + from lib.concurrent import futures + else: + from lib.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 e85a762f..8f2047b2 100644 --- a/channels/vvvvid.py +++ b/channels/vvvvid.py @@ -6,7 +6,11 @@ import requests, re from core import support, tmdb from core.item import Item from specials import autorenumber -from lib.concurrent import futures +import sys +if sys.version_info[0] >= 3: + from lib.concurrent import futures +else: + from lib.concurrent_py2 import futures host = support.config.get_channel_url() diff --git a/core/servertools.py b/core/servertools.py index c343a286..981a8e5a 100644 --- a/core/servertools.py +++ b/core/servertools.py @@ -736,7 +736,11 @@ def check_list_links(itemlist, numero='', timeout=3): El parámetro timeout indica un tope de espera para descargar la página """ numero = ((int(numero) + 1) * 5) if numero != '' else 10 - from lib.concurrent import futures + import sys + if sys.version_info[0] >= 3: + from lib.concurrent import futures + else: + from lib.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 f15248ee..e9ef85c1 100755 --- a/core/support.py +++ b/core/support.py @@ -5,7 +5,11 @@ import base64 import inspect import os import re -from concurrent import futures +import sys +if sys.version_info[0] >= 3: + from lib.concurrent import futures +else: + from lib.concurrent_py2 import futures try: import urllib.request as urllib diff --git a/lib/concurrent/__init__.py b/lib/concurrent_py2/__init__.py similarity index 100% rename from lib/concurrent/__init__.py rename to lib/concurrent_py2/__init__.py diff --git a/lib/concurrent/futures/__init__.py b/lib/concurrent_py2/futures/__init__.py similarity index 100% rename from lib/concurrent/futures/__init__.py rename to lib/concurrent_py2/futures/__init__.py diff --git a/lib/concurrent/futures/_base.py b/lib/concurrent_py2/futures/_base.py similarity index 100% rename from lib/concurrent/futures/_base.py rename to lib/concurrent_py2/futures/_base.py diff --git a/lib/concurrent/futures/_compat.py b/lib/concurrent_py2/futures/_compat.py similarity index 100% rename from lib/concurrent/futures/_compat.py rename to lib/concurrent_py2/futures/_compat.py diff --git a/lib/concurrent/futures/process.py b/lib/concurrent_py2/futures/process.py similarity index 100% rename from lib/concurrent/futures/process.py rename to lib/concurrent_py2/futures/process.py diff --git a/lib/concurrent/futures/thread.py b/lib/concurrent_py2/futures/thread.py similarity index 100% rename from lib/concurrent/futures/thread.py rename to lib/concurrent_py2/futures/thread.py diff --git a/lib/unshortenit.py b/lib/unshortenit.py index ebacd3a4..4427ba47 100644 --- a/lib/unshortenit.py +++ b/lib/unshortenit.py @@ -591,7 +591,11 @@ def findlinks(text): # for match in matches: # sh = unshorten(match)[0] # text += '\n' + sh - from concurrent import futures + import sys + if sys.version_info[0] >= 3: + from lib.concurrent import futures + else: + from lib.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 b62dc156..f7320e0b 100644 --- a/specials/community.py +++ b/specials/community.py @@ -447,7 +447,11 @@ def get_search_menu(item, json='', itemlist=[], channel_name=''): def submenu(item, json, key, itemlist = []): - from lib.concurrent import futures + import sys + if sys.version_info[0] >= 3: + from lib.concurrent import futures + else: + from lib.concurrent_py2 import futures filter_list = [] for option in json[key]: diff --git a/specials/nextep.py b/specials/nextep.py index 82361937..b4d2fd49 100644 --- a/specials/nextep.py +++ b/specials/nextep.py @@ -4,7 +4,11 @@ from platformcode import config, platformtools, logger from time import time, sleep from core import scrapertools from core import jsontools, filetools -from lib.concurrent import futures +import sys +if sys.version_info[0] >= 3: + from lib.concurrent import futures +else: + from lib.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 6705216c..1b4ee4d5 100644 --- a/specials/search.py +++ b/specials/search.py @@ -12,7 +12,11 @@ PY3 = False if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int import os, json, time, inspect, channelselector -from concurrent import futures + +if PY3 + from lib.concurrent import futures +else: + from lib.concurrent_py2 import futures from core.item import Item from core import tmdb, scrapertools, channeltools, filetools, jsontools from channelselector import get_thumb