merged from develop

2017-08-13 17:07:36 +02:00
parent ebda6babdd
commit ed553f5cae
398 changed files with 10399 additions and 2029 deletions
@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-

-import re
 import urllib

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

 token = ""
 excption = False