From 922f54fafe08020c4471e042500fad6209201177 Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 6 Oct 2020 18:18:52 +0200 Subject: [PATCH] ultimi import urllib PY3 --- channels/youtube_channel.py | 8 +++++--- servers/akvideo.py | 6 +++++- servers/nowvideo.py | 5 ++++- servers/turbovid.py | 5 ++++- specials/favorites.py | 5 ++++- specials/filmontv.py | 6 ++++-- 6 files changed, 26 insertions(+), 9 deletions(-) diff --git a/channels/youtube_channel.py b/channels/youtube_channel.py index 468fb554..66409814 100644 --- a/channels/youtube_channel.py +++ b/channels/youtube_channel.py @@ -1,11 +1,13 @@ # -*- coding: utf-8 -*- -import urllib +try: + import urllib.parse as urllib +except ImportError: + import urllib -from core import jsontools +from core import jsontools, httptools from core.item import Item from platformcode import logger -from platformcode import config CHANNELNAME = "youtube_channel" YOUTUBE_V3_API_KEY = "AIzaSyCjsmBT0JZy1RT-PLwB-Zkfba87sa2inyI" diff --git a/servers/akvideo.py b/servers/akvideo.py index 14ff3836..346b3ff3 100644 --- a/servers/akvideo.py +++ b/servers/akvideo.py @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- -import urllib +try: + import urllib.parse as urllib +except ImportError: + import urllib from core import httptools, support from core import scrapertools @@ -8,6 +11,7 @@ from platformcode import logger, config headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:54.0) Gecko/20100101 Firefox/54.0']] + def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) # page_url = re.sub('akvideo.stream/(?:video/|video\\.php\\?file_code=)?(?:embed-)?([a-zA-Z0-9]+)','akvideo.stream/video/\\1',page_url) diff --git a/servers/nowvideo.py b/servers/nowvideo.py index 170b3f94..95271e63 100644 --- a/servers/nowvideo.py +++ b/servers/nowvideo.py @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- -import urllib +try: + import urllib.parse as urllib +except ImportError: + import urllib from core import httptools from core import scrapertools diff --git a/servers/turbovid.py b/servers/turbovid.py index 8353df9b..4bb6b993 100644 --- a/servers/turbovid.py +++ b/servers/turbovid.py @@ -1,7 +1,10 @@ # -*- coding: utf-8 -*- import time -import urllib +try: + import urllib.parse as urllib +except ImportError: + import urllib from core import httptools, support from core import scrapertools diff --git a/specials/favorites.py b/specials/favorites.py index b6fe9720..d7c885bc 100644 --- a/specials/favorites.py +++ b/specials/favorites.py @@ -138,7 +138,10 @@ def renameFavourite(item): # Features to migrate old favorites (.txt) def readbookmark(filepath): logger.info() - import urllib + try: + import urllib.parse as urllib + except ImportError: + import urllib bookmarkfile = filetools.file_open(filepath) diff --git a/specials/filmontv.py b/specials/filmontv.py index 47f1c0dc..5def299e 100644 --- a/specials/filmontv.py +++ b/specials/filmontv.py @@ -4,8 +4,10 @@ # ------------------------------------------------------------ import re -import urllib -from channelselector import get_thumb +try: + import urllib.parse as urllib +except ImportError: + import urllib from core import httptools, scrapertools, support, tmdb, filetools from core.item import Item from platformcode import logger, config, platformtools