updates requested

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__)
 

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__)

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__)
 

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__)

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
 

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),

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'))

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])

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()

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()

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__)
 

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__)
 

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__)
 

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():

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()

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()

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')

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()

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__)
 

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()