refactor tests

platformcode/logger.py

@@ -13,7 +13,12 @@ PY3 = False
 if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int
 
 loggeractive = (config.get_setting("debug") == True)
-
+try:
+    xbmc.KodiStub()
+    testMode = True
+    import cgi
+except:
+    testMode = False
 
 def log_enable(active):
     global loggeractive
@@ -39,6 +44,9 @@ def encode_log(message=""):
     else:
         message = str(message)
 
+    if testMode:
+        message = cgi.escape(message)
+
     return message
 
 

platformcode/platformtools.py

@@ -15,7 +15,7 @@ else:
 import os, xbmc, xbmcgui, xbmcplugin
 from past.utils import old_div
 from channelselector import get_thumb
-from core import trakt_tools, scrapertools
+from core import scrapertools
 from core.item import Item
 from platformcode import logger, config
 
@@ -920,6 +920,7 @@ def set_player(item, xlistitem, mediaurl, view, strm, nfo_path=None, head_nfo=No
             # Reproduce
             xbmc_player.play(playlist, xlistitem)
             if config.get_setting('trakt_sync'):
+                from core import trakt_tools
                 trakt_tools.wait_for_update_trakt()
 
         elif player_mode == 1: