diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py index c3329868..a9743158 100644 --- a/channels/cinemalibero.py +++ b/channels/cinemalibero.py @@ -14,7 +14,10 @@ list_quality = ['default'] def findhost(): permUrl = httptools.downloadpage('https://www.cinemalibero.online/', follow_redirects=False).headers - import urlparse + try: + import urlparse + except: + import urllib.parse as urlparse p = list(urlparse.urlparse(permUrl['location'].replace('https://www.google.com/search?q=site:', ''))) if not p[0]: p[0] = 'https' diff --git a/channels/cinetecadibologna.py b/channels/cinetecadibologna.py index 9bf10c08..cc66d5d5 100644 --- a/channels/cinetecadibologna.py +++ b/channels/cinetecadibologna.py @@ -3,14 +3,7 @@ # Ringraziamo Icarus crew # Canale per cinetecadibologna # ------------------------------------------------------------ - -import re - -import urlparse - -from core import httptools, scrapertools from core.item import Item -from platformcode import logger, config from core import support diff --git a/channels/dsda.py b/channels/dsda.py index d1a2a4f3..0586be06 100644 --- a/channels/dsda.py +++ b/channels/dsda.py @@ -3,10 +3,8 @@ # Ringraziamo Icarus crew # Canale per documentaristreamingda # ------------------------------------------------------------ -import re -import urlparse -from core import httptools, scrapertools, servertools, support +from core import support from core.item import Item from platformcode import logger, config diff --git a/channels/filmsenzalimiticc.py b/channels/filmsenzalimiticc.py index 2f3fd290..689a9a1a 100644 --- a/channels/filmsenzalimiticc.py +++ b/channels/filmsenzalimiticc.py @@ -4,7 +4,10 @@ # ------------------------------------------------------------ import re -import urlparse +try: + import urlparse +except: + import urllib.parse as urlparse from core import scrapertools, servertools, httptools from core import tmdb diff --git a/core/filetools.py b/core/filetools.py index 801e999b..03903f18 100644 --- a/core/filetools.py +++ b/core/filetools.py @@ -87,7 +87,7 @@ def encode(path, _samba=False): if scrapertools.find_single_match(path, '(^\w+:\/\/)') or _samba: path = path.encode("utf-8", "ignore") else: - if fs_encoding: + if fs_encoding and not PY3: path = path.encode(fs_encoding, "ignore") return path diff --git a/core/tmdb.py b/core/tmdb.py index 2767c7ab..e470195f 100644 --- a/core/tmdb.py +++ b/core/tmdb.py @@ -21,7 +21,6 @@ import copy import re import sqlite3 import time -import urllib import xbmcaddon 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/platformcode/platformtools.py b/platformcode/platformtools.py index f20e5e73..30019d9e 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -1143,7 +1143,7 @@ def get_video_seleccionado(item, seleccion, video_urls): return mediaurl, view, mpd -def set_player(item, xlistitem, mediaurl, view, strm, autoplay): +def set_player(item, xlistitem, mediaurl, view, strm): logger.info() logger.debug("item:\n" + item.tostring('\n')) # Movido del conector "torrent" aqui diff --git a/servers/vcstream.py b/servers/vcstream.py index b21f2a1d..4a28eb22 100644 --- a/servers/vcstream.py +++ b/servers/vcstream.py @@ -2,7 +2,10 @@ # Icarus pv7 # Fix dentaku65 -import urlparse +try: + import urlparse +except: + import urllib.parse as urlparse from core import httptools from core import scrapertools diff --git a/servers/youtube.py b/servers/youtube.py index b00e94ed..9e005a67 100644 --- a/servers/youtube.py +++ b/servers/youtube.py @@ -3,7 +3,10 @@ import re import urllib -import urlparse +try: + import urlparse +except: + import urllib.parse as urlparse from core import httptools from core import jsontools as json diff --git a/specials/resolverdns.py b/specials/resolverdns.py index 73f043bb..6fa6ad2a 100644 --- a/specials/resolverdns.py +++ b/specials/resolverdns.py @@ -1,7 +1,10 @@ # -*- coding: utf-8 -*- import os import ssl -import urlparse +try: + import urlparse +except: + import urllib.parse as urlparse from lib.requests_toolbelt.adapters import host_header_ssl from lib import doh diff --git a/specials/search.py b/specials/search.py index 21af780a..04093339 100644 --- a/specials/search.py +++ b/specials/search.py @@ -12,7 +12,7 @@ PY3 = False if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int import os, json, time, inspect, channelselector -from lib.concurrent import futures +from concurrent import futures from core.item import Item from core import tmdb, scrapertools, channeltools, filetools, jsontools from channelselector import get_thumb