ultimi import urllib PY3

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"

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)

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

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

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)
 

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