merged from develop

2017-08-13 17:07:36 +02:00
parent ebda6babdd
commit ed553f5cae
398 changed files with 10399 additions and 2029 deletions
@@ -15,9 +15,8 @@ import urllib2

 import xbmc
 import xbmcgui
-from core import config
 from core import downloadtools
-from core import logger
+from platformcode import config, logger


 # Download a file and start playing while downloading
@@ -323,6 +322,7 @@ class DownloadThread(threading.Thread):
                                self.tiempofalta = 0
                        break
                    except:
+                        import sys
                        reintentos = reintentos + 1
                        logger.info("ERROR en la descarga del bloque, reintento %d" % reintentos)
                        for line in sys.exc_info():