合并py2和py3版本

qiyeboy · Jan 16, 2017 · acce5a7 · pychen-raw · Nov 2, 2019 · acce5a7
1 parent dd7b136
commit acce5a7
Show file tree

Hide file tree

Showing 67 changed files with 85 additions and 1,661 deletions.
diff --git a/IPProxyPool_py2/IPProxy.py → IPProxy.py b/IPProxyPool_py2/IPProxy.py → IPProxy.py
@@ -1,13 +1,11 @@
 # coding:utf-8
+
 from multiprocessing import Value, Queue, Process
 from api.apiServer import start_api_server
-import sys
 from db.DataStore import store_data
-from spider.ProxyCrawl import startProxyCrawl
-from validator.Validator import validator, getMyIP
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+from validator.Validator import validator, getMyIP
+from spider.ProxyCrawl import startProxyCrawl
 
 if __name__ == "__main__":
     myip = getMyIP()

diff --git a/IPProxyPool_py2/config.py b/IPProxyPool_py2/config.py
diff --git a/IPProxyPool_py2/data/proxy.db b/IPProxyPool_py2/data/proxy.db
diff --git a/IPProxyPool_py2/db/DataStore.py b/IPProxyPool_py2/db/DataStore.py
diff --git a/IPProxyPool_py2/db/RedisHelper.py b/IPProxyPool_py2/db/RedisHelper.py