From 759638e2ffb5ca55f3f4e93d91ee60cd780e06d1 Mon Sep 17 00:00:00 2001 From: faush01 Date: Fri, 11 Jan 2019 10:24:42 +1100 Subject: [PATCH] updates requested --- resources/lib/action_menu.py | 2 +- resources/lib/cache_images.py | 12 ++++++------ resources/lib/clientinfo.py | 4 ++-- resources/lib/context_monitor.py | 2 +- resources/lib/datamanager.py | 8 ++++---- resources/lib/downloadutils.py | 14 +++++++------- resources/lib/functions.py | 4 ++-- resources/lib/item_functions.py | 8 ++++---- resources/lib/kodi_utils.py | 2 +- resources/lib/menu_functions.py | 12 ++++++------ resources/lib/resume_dialog.py | 4 ++-- resources/lib/server_detect.py | 10 +++++----- resources/lib/server_sessions.py | 8 ++++---- resources/lib/simple_logging.py | 2 +- resources/lib/trakttokodi.py | 6 +++--- resources/lib/translation.py | 2 +- resources/lib/utils.py | 6 +++--- resources/lib/websocket.py | 6 +++--- resources/lib/websocket_client.py | 10 +++++----- resources/lib/widgets.py | 12 ++++++------ 20 files changed, 67 insertions(+), 67 deletions(-) diff --git a/resources/lib/action_menu.py b/resources/lib/action_menu.py index 3acd9c6..cb4e557 100644 --- a/resources/lib/action_menu.py +++ b/resources/lib/action_menu.py @@ -7,7 +7,7 @@ import xbmc import xbmcaddon import xbmcgui -from simple_logging import SimpleLogging +from .simple_logging import SimpleLogging log = SimpleLogging(__name__) diff --git a/resources/lib/cache_images.py b/resources/lib/cache_images.py index 5dfeb3f..830bee4 100644 --- a/resources/lib/cache_images.py +++ b/resources/lib/cache_images.py @@ -11,12 +11,12 @@ import sys import threading import time -from downloadutils import DownloadUtils -from simple_logging import SimpleLogging -from json_rpc import json_rpc -from translation import string_load -from datamanager import DataManager -from utils import getArt, double_urlencode +from .downloadutils import DownloadUtils +from .simple_logging import SimpleLogging +from .json_rpc import json_rpc +from .translation import string_load +from .datamanager import DataManager +from .utils import getArt, double_urlencode downloadUtils = DownloadUtils() log = SimpleLogging(__name__) diff --git a/resources/lib/clientinfo.py b/resources/lib/clientinfo.py index 2f2be8c..ee41137 100644 --- a/resources/lib/clientinfo.py +++ b/resources/lib/clientinfo.py @@ -5,8 +5,8 @@ import xbmcaddon import xbmc import xbmcvfs -from kodi_utils import HomeWindow -from simple_logging import SimpleLogging +from .kodi_utils import HomeWindow +from .simple_logging import SimpleLogging log = SimpleLogging(__name__) diff --git a/resources/lib/context_monitor.py b/resources/lib/context_monitor.py index ec8e8d4..4d13374 100644 --- a/resources/lib/context_monitor.py +++ b/resources/lib/context_monitor.py @@ -3,7 +3,7 @@ import sys import xbmc import xbmcgui -from simple_logging import SimpleLogging +from .simple_logging import SimpleLogging from resources.lib.functions import show_menu log = SimpleLogging(__name__) diff --git a/resources/lib/datamanager.py b/resources/lib/datamanager.py index a3f20b7..286858a 100644 --- a/resources/lib/datamanager.py +++ b/resources/lib/datamanager.py @@ -10,9 +10,9 @@ import time #import copy #import urllib -from downloadutils import DownloadUtils -from simple_logging import SimpleLogging -from item_functions import extract_item_info +from .downloadutils import DownloadUtils +from .simple_logging import SimpleLogging +from .item_functions import extract_item_info from .kodi_utils import HomeWindow import xbmc @@ -88,7 +88,7 @@ class DataManager(): cache_item = cPickle.load(handle) cache_thread.cached_item = cache_item item_list = cache_item.item_list - except Exception, err: + except Exception as err: log.debug("Pickle Data Load Failed : {0}", err) item_list = None diff --git a/resources/lib/downloadutils.py b/resources/lib/downloadutils.py index 61adbee..a057de5 100644 --- a/resources/lib/downloadutils.py +++ b/resources/lib/downloadutils.py @@ -15,10 +15,10 @@ from urlparse import urlparse import urllib from datetime import datetime -from kodi_utils import HomeWindow -from clientinfo import ClientInformation -from simple_logging import SimpleLogging -from translation import string_load +from .kodi_utils import HomeWindow +from .clientinfo import ClientInformation +from .simple_logging import SimpleLogging +from .translation import string_load log = SimpleLogging(__name__) @@ -368,7 +368,7 @@ class DownloadUtils(): jsonData = None try: jsonData = self.downloadUrl("{server}/emby/Users/Public?format=json", suppress=True, authenticate=False) - except Exception, msg: + except Exception as msg: log.error("Get User unable to connect: {0}", msg) return "" @@ -378,7 +378,7 @@ class DownloadUtils(): try: result = json.loads(jsonData) - except Exception, e: + except Exception as e: log.debug("Could not load user data: {0}", e) return "" @@ -651,7 +651,7 @@ class DownloadUtils(): string_load(30200) % str(data.reason), icon="special://home/addons/plugin.video.embycon/icon.png") - except Exception, msg: + except Exception as msg: log.error("Unable to connect to {0} : {1}", server, msg) if suppress is False: xbmcgui.Dialog().notification(string_load(30316), diff --git a/resources/lib/functions.py b/resources/lib/functions.py index 5beab73..7cc0ed4 100644 --- a/resources/lib/functions.py +++ b/resources/lib/functions.py @@ -31,10 +31,10 @@ from .translation import string_load from .server_sessions import showServerSessions from .action_menu import ActionMenu from .widgets import getWidgetContent, get_widget_content_cast -import trakttokodi +from . import trakttokodi from .item_functions import add_gui_item, extract_item_info, ItemDetails from .cache_images import CacheArtwork -from dir_functions import getContent, processDirectory +from .dir_functions import getContent, processDirectory __addon__ = xbmcaddon.Addon() __addondir__ = xbmc.translatePath(__addon__.getAddonInfo('profile')) diff --git a/resources/lib/item_functions.py b/resources/lib/item_functions.py index eaebd52..341b9cc 100644 --- a/resources/lib/item_functions.py +++ b/resources/lib/item_functions.py @@ -13,10 +13,10 @@ import xbmc import xbmcaddon import xbmcgui -from utils import getArt, datetime_from_string -from simple_logging import SimpleLogging -from downloadutils import DownloadUtils -from kodi_utils import HomeWindow +from .utils import getArt, datetime_from_string +from .simple_logging import SimpleLogging +from .downloadutils import DownloadUtils +from .kodi_utils import HomeWindow log = SimpleLogging(__name__) kodi_version = int(xbmc.getInfoLabel('System.BuildVersion')[:2]) diff --git a/resources/lib/kodi_utils.py b/resources/lib/kodi_utils.py index 748bef3..dfd37ee 100644 --- a/resources/lib/kodi_utils.py +++ b/resources/lib/kodi_utils.py @@ -6,7 +6,7 @@ import xbmcaddon import sys import json -from simple_logging import SimpleLogging +from .simple_logging import SimpleLogging log = SimpleLogging(__name__) addon = xbmcaddon.Addon() diff --git a/resources/lib/menu_functions.py b/resources/lib/menu_functions.py index 7f7668c..1df434d 100644 --- a/resources/lib/menu_functions.py +++ b/resources/lib/menu_functions.py @@ -8,12 +8,12 @@ import urllib import xbmcplugin import xbmcaddon -from downloadutils import DownloadUtils -from kodi_utils import addMenuDirectoryItem, HomeWindow -from simple_logging import SimpleLogging -from translation import string_load -from datamanager import DataManager -from utils import getArt +from .downloadutils import DownloadUtils +from .kodi_utils import addMenuDirectoryItem, HomeWindow +from .simple_logging import SimpleLogging +from .translation import string_load +from .datamanager import DataManager +from .utils import getArt log = SimpleLogging(__name__) downloadUtils = DownloadUtils() diff --git a/resources/lib/resume_dialog.py b/resources/lib/resume_dialog.py index eb98880..4a353d1 100644 --- a/resources/lib/resume_dialog.py +++ b/resources/lib/resume_dialog.py @@ -2,8 +2,8 @@ import xbmcgui -from simple_logging import SimpleLogging -from translation import string_load +from .simple_logging import SimpleLogging +from .translation import string_load log = SimpleLogging(__name__) diff --git a/resources/lib/server_detect.py b/resources/lib/server_detect.py index fbba917..7096f6a 100644 --- a/resources/lib/server_detect.py +++ b/resources/lib/server_detect.py @@ -11,11 +11,11 @@ import xbmcaddon import xbmcgui import xbmc -from kodi_utils import HomeWindow -from downloadutils import DownloadUtils -from simple_logging import SimpleLogging -from translation import string_load -from utils import datetime_from_string +from .kodi_utils import HomeWindow +from .downloadutils import DownloadUtils +from .simple_logging import SimpleLogging +from .translation import string_load +from .utils import datetime_from_string log = SimpleLogging(__name__) diff --git a/resources/lib/server_sessions.py b/resources/lib/server_sessions.py index 7fa347a..f72537f 100644 --- a/resources/lib/server_sessions.py +++ b/resources/lib/server_sessions.py @@ -4,10 +4,10 @@ import sys import xbmcgui import xbmcplugin -from downloadutils import DownloadUtils -from simple_logging import SimpleLogging -from utils import getArt -from datamanager import DataManager +from .downloadutils import DownloadUtils +from .simple_logging import SimpleLogging +from .utils import getArt +from .datamanager import DataManager log = SimpleLogging(__name__) diff --git a/resources/lib/simple_logging.py b/resources/lib/simple_logging.py index 624cf23..1597299 100644 --- a/resources/lib/simple_logging.py +++ b/resources/lib/simple_logging.py @@ -2,7 +2,7 @@ import xbmc import xbmcaddon -from json_rpc import json_rpc +from .json_rpc import json_rpc class SimpleLogging(): diff --git a/resources/lib/trakttokodi.py b/resources/lib/trakttokodi.py index e476ab1..58781e0 100644 --- a/resources/lib/trakttokodi.py +++ b/resources/lib/trakttokodi.py @@ -6,10 +6,10 @@ import encodings import xbmc import xbmcgui -from simple_logging import SimpleLogging -from datamanager import DataManager +from .simple_logging import SimpleLogging +from .datamanager import DataManager -from translation import string_load +from .translation import string_load log = SimpleLogging(__name__) dataManager = DataManager() diff --git a/resources/lib/translation.py b/resources/lib/translation.py index a2948de..250d579 100644 --- a/resources/lib/translation.py +++ b/resources/lib/translation.py @@ -1,6 +1,6 @@ import encodings import xbmcaddon -from simple_logging import SimpleLogging +from .simple_logging import SimpleLogging log = SimpleLogging(__name__) addon = xbmcaddon.Addon() diff --git a/resources/lib/utils.py b/resources/lib/utils.py index dca1262..143051c 100644 --- a/resources/lib/utils.py +++ b/resources/lib/utils.py @@ -15,9 +15,9 @@ import _strptime import calendar import re -from downloadutils import DownloadUtils -from simple_logging import SimpleLogging -from clientinfo import ClientInformation +from .downloadutils import DownloadUtils +from .simple_logging import SimpleLogging +from .clientinfo import ClientInformation # hack to get datetime strptime loaded throwaway = time.strptime('20110101','%Y%m%d') diff --git a/resources/lib/websocket.py b/resources/lib/websocket.py index a533652..076c0b0 100644 --- a/resources/lib/websocket.py +++ b/resources/lib/websocket.py @@ -893,12 +893,12 @@ class WebSocketApp(object): break self._callback(self.on_message, data) - except Exception, e: + except Exception as e: #print str(e.args[0]) if "timed out" not in e.args[0]: raise e - except Exception, e: + except Exception as e: self._callback(self.on_error, e) finally: if thread: @@ -911,7 +911,7 @@ class WebSocketApp(object): if callback: try: callback(self, *args) - except Exception, e: + except Exception as e: logger.error(e) if True:#logger.isEnabledFor(logging.DEBUG): _, _, tb = sys.exc_info() diff --git a/resources/lib/websocket_client.py b/resources/lib/websocket_client.py index 1f7866e..b7291a9 100644 --- a/resources/lib/websocket_client.py +++ b/resources/lib/websocket_client.py @@ -9,11 +9,11 @@ import websocket import xbmc import xbmcgui -from functions import PLAY -from simple_logging import SimpleLogging -import clientinfo -import downloadutils -from json_rpc import json_rpc +from .functions import PLAY +from .simple_logging import SimpleLogging +from . import clientinfo +from . import downloadutils +from .json_rpc import json_rpc log = SimpleLogging(__name__) diff --git a/resources/lib/widgets.py b/resources/lib/widgets.py index ade1012..3c92dea 100644 --- a/resources/lib/widgets.py +++ b/resources/lib/widgets.py @@ -9,12 +9,12 @@ import time import random import sys -from downloadutils import DownloadUtils -from utils import getArt -from datamanager import DataManager -from simple_logging import SimpleLogging -from kodi_utils import HomeWindow -from dir_functions import processDirectory +from .downloadutils import DownloadUtils +from .utils import getArt +from .datamanager import DataManager +from .simple_logging import SimpleLogging +from .kodi_utils import HomeWindow +from .dir_functions import processDirectory log = SimpleLogging(__name__) downloadUtils = DownloadUtils()