merged from develop

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

 from core import httptools
 from core import jsontools
-from core import logger
 from core import scrapertools
+from platformcode import logger


 def get_video_url(page_url, premium=False, user="", password="", video_password=""):